From fcc6d71be2c3ce7d9305c04fc2e87af554571bac Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Mon, 22 Feb 2021 20:37:25 +0100
Subject: go.mod: update golangci-lint to v1.37

---
 vendor/github.com/daixiang0/gci/pkg/gci/gci.go |  16 +--
 vendor/github.com/daixiang0/gci/pkg/gci/std.go | 161 +++++++++++++++++++++++++
 2 files changed, 170 insertions(+), 7 deletions(-)
 create mode 100644 vendor/github.com/daixiang0/gci/pkg/gci/std.go

(limited to 'vendor/github.com/daixiang0')

diff --git a/vendor/github.com/daixiang0/gci/pkg/gci/gci.go b/vendor/github.com/daixiang0/gci/pkg/gci/gci.go
index f91d9b373..7e31b870b 100644
--- a/vendor/github.com/daixiang0/gci/pkg/gci/gci.go
+++ b/vendor/github.com/daixiang0/gci/pkg/gci/gci.go
@@ -26,7 +26,6 @@ var (
 	importStartFlag = []byte(`
 import (
 `)
-
 	importEndFlag = []byte(`
 )
 `)
@@ -158,17 +157,20 @@ func getPkgInfo(line string, comment bool) (string, string, string) {
 }
 
 func getPkgType(line, localFlag string) int {
-	if !strings.Contains(line, dot) {
-		return standard
-	} else if strings.Contains(line, localFlag) {
+	pkgName := strings.Trim(line, "\"\\`")
+
+	if localFlag != "" && strings.HasPrefix(pkgName, localFlag) {
 		return local
-	} else {
-		return remote
 	}
+
+	if isStandardPackage(pkgName) {
+		return standard
+	}
+
+	return remote
 }
 
 const (
-	dot       = "."
 	blank     = " "
 	indent    = "\t"
 	linebreak = "\n"
diff --git a/vendor/github.com/daixiang0/gci/pkg/gci/std.go b/vendor/github.com/daixiang0/gci/pkg/gci/std.go
new file mode 100644
index 000000000..ac96b55ab
--- /dev/null
+++ b/vendor/github.com/daixiang0/gci/pkg/gci/std.go
@@ -0,0 +1,161 @@
+package gci
+
+// Code generated based on go1.16beta1. DO NOT EDIT.
+
+var standardPackages = map[string]struct{}{
+	"archive/tar":          {},
+	"archive/zip":          {},
+	"bufio":                {},
+	"bytes":                {},
+	"compress/bzip2":       {},
+	"compress/flate":       {},
+	"compress/gzip":        {},
+	"compress/lzw":         {},
+	"compress/zlib":        {},
+	"container/heap":       {},
+	"container/list":       {},
+	"container/ring":       {},
+	"context":              {},
+	"crypto":               {},
+	"crypto/aes":           {},
+	"crypto/cipher":        {},
+	"crypto/des":           {},
+	"crypto/dsa":           {},
+	"crypto/ecdsa":         {},
+	"crypto/ed25519":       {},
+	"crypto/elliptic":      {},
+	"crypto/hmac":          {},
+	"crypto/md5":           {},
+	"crypto/rand":          {},
+	"crypto/rc4":           {},
+	"crypto/rsa":           {},
+	"crypto/sha1":          {},
+	"crypto/sha256":        {},
+	"crypto/sha512":        {},
+	"crypto/subtle":        {},
+	"crypto/tls":           {},
+	"crypto/x509":          {},
+	"crypto/x509/pkix":     {},
+	"database/sql":         {},
+	"database/sql/driver":  {},
+	"debug/dwarf":          {},
+	"debug/elf":            {},
+	"debug/gosym":          {},
+	"debug/macho":          {},
+	"debug/pe":             {},
+	"debug/plan9obj":       {},
+	"embed":                {},
+	"encoding":             {},
+	"encoding/ascii85":     {},
+	"encoding/asn1":        {},
+	"encoding/base32":      {},
+	"encoding/base64":      {},
+	"encoding/binary":      {},
+	"encoding/csv":         {},
+	"encoding/gob":         {},
+	"encoding/hex":         {},
+	"encoding/json":        {},
+	"encoding/pem":         {},
+	"encoding/xml":         {},
+	"errors":               {},
+	"expvar":               {},
+	"flag":                 {},
+	"fmt":                  {},
+	"go/ast":               {},
+	"go/build":             {},
+	"go/constant":          {},
+	"go/doc":               {},
+	"go/format":            {},
+	"go/importer":          {},
+	"go/parser":            {},
+	"go/printer":           {},
+	"go/scanner":           {},
+	"go/token":             {},
+	"go/types":             {},
+	"hash":                 {},
+	"hash/adler32":         {},
+	"hash/crc32":           {},
+	"hash/crc64":           {},
+	"hash/fnv":             {},
+	"hash/maphash":         {},
+	"html":                 {},
+	"html/template":        {},
+	"image":                {},
+	"image/color":          {},
+	"image/color/palette":  {},
+	"image/draw":           {},
+	"image/gif":            {},
+	"image/jpeg":           {},
+	"image/png":            {},
+	"index/suffixarray":    {},
+	"io":                   {},
+	"io/fs":                {},
+	"io/ioutil":            {},
+	"log":                  {},
+	"log/syslog":           {},
+	"math":                 {},
+	"math/big":             {},
+	"math/bits":            {},
+	"math/cmplx":           {},
+	"math/rand":            {},
+	"mime":                 {},
+	"mime/multipart":       {},
+	"mime/quotedprintable": {},
+	"net":                  {},
+	"net/http":             {},
+	"net/http/cgi":         {},
+	"net/http/cookiejar":   {},
+	"net/http/fcgi":        {},
+	"net/http/httptest":    {},
+	"net/http/httptrace":   {},
+	"net/http/httputil":    {},
+	"net/http/pprof":       {},
+	"net/mail":             {},
+	"net/rpc":              {},
+	"net/rpc/jsonrpc":      {},
+	"net/smtp":             {},
+	"net/textproto":        {},
+	"net/url":              {},
+	"os":                   {},
+	"os/exec":              {},
+	"os/signal":            {},
+	"os/user":              {},
+	"path":                 {},
+	"path/filepath":        {},
+	"plugin":               {},
+	"reflect":              {},
+	"regexp":               {},
+	"regexp/syntax":        {},
+	"runtime":              {},
+	"runtime/cgo":          {},
+	"runtime/debug":        {},
+	"runtime/metrics":      {},
+	"runtime/pprof":        {},
+	"runtime/race":         {},
+	"runtime/trace":        {},
+	"sort":                 {},
+	"strconv":              {},
+	"strings":              {},
+	"sync":                 {},
+	"sync/atomic":          {},
+	"syscall":              {},
+	"testing":              {},
+	"testing/fstest":       {},
+	"testing/iotest":       {},
+	"testing/quick":        {},
+	"text/scanner":         {},
+	"text/tabwriter":       {},
+	"text/template":        {},
+	"text/template/parse":  {},
+	"time":                 {},
+	"time/tzdata":          {},
+	"unicode":              {},
+	"unicode/utf16":        {},
+	"unicode/utf8":         {},
+	"unsafe":               {},
+}
+
+func isStandardPackage(pkg string) bool {
+	_, ok := standardPackages[pkg]
+	return ok
+}
-- 
cgit mrf-deployment