From 960f2cac2515787d34c06af4e3335f272df2ef5c Mon Sep 17 00:00:00 2001 From: Simon Sawert Date: Sat, 10 Oct 2020 12:41:56 +0200 Subject: [PATCH 1/7] Update gochecknoglobals, use source analyzer --- go.mod | 3 +- go.sum | 6 +- pkg/golinters/gochecknoglobals.go | 93 ++----------------------------- test/testdata/gochecknoglobals.go | 8 ++- 4 files changed, 19 insertions(+), 91 deletions(-) diff --git a/go.mod b/go.mod index 0e8f9a1ed214..3b18554f52e2 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/golangci/golangci-lint go 1.12 require ( + 4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a github.com/Djarvur/go-err113 v0.0.0-20200511133814-5174e21577d5 github.com/OpenPeeDeeP/depguard v1.0.1 github.com/bombsimon/wsl/v3 v3.1.0 @@ -61,7 +62,7 @@ require ( github.com/ultraware/whitespace v0.0.4 github.com/uudashr/gocognit v1.0.1 github.com/valyala/quicktemplate v1.6.3 - golang.org/x/tools v0.0.0-20200918232735-d647fc253266 + golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d gopkg.in/yaml.v2 v2.3.0 honnef.co/go/tools v0.0.1-2020.1.5 mvdan.cc/gofumpt v0.0.0-20200802201014-ab5a8192947d diff --git a/go.sum b/go.sum index e35d53b6a433..b06e2da0104d 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a h1:wFEQiK85fRsEVF0CRrPAos5LoAryUsIX1kPW/WrIqFw= +4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a/go.mod h1:wfdC5ZjKSPr7CybKEcgJhUOgeAQW1+7WcyK8OvUilfo= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -542,8 +544,8 @@ golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200731060945-b5fad4ed8dd6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200812195022-5ae4c3c160a0/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200831203904-5a2aa26beb65/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20200918232735-d647fc253266 h1:k7tVuG0g1JwmD3Jh8oAl1vQ1C3jb4Hi/dUl1wWDBJpQ= -golang.org/x/tools v0.0.0-20200918232735-d647fc253266/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d h1:vWQvJ/Z0Lu+9/8oQ/pAYXNzbc7CMnBl+tULGVHOy3oE= +golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/pkg/golinters/gochecknoglobals.go b/pkg/golinters/gochecknoglobals.go index f2166416be3a..4cd405428d87 100644 --- a/pkg/golinters/gochecknoglobals.go +++ b/pkg/golinters/gochecknoglobals.go @@ -1,100 +1,19 @@ package golinters import ( - "fmt" - "go/ast" - "go/token" - "strings" - "sync" - "golang.org/x/tools/go/analysis" + "4d63.com/gochecknoglobals/checknoglobals" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" - "github.com/golangci/golangci-lint/pkg/lint/linter" - "github.com/golangci/golangci-lint/pkg/result" ) -const gochecknoglobalsName = "gochecknoglobals" - -//nolint:dupl func NewGochecknoglobals() *goanalysis.Linter { - var mu sync.Mutex - var resIssues []goanalysis.Issue - - analyzer := &analysis.Analyzer{ - Name: gochecknoglobalsName, - Doc: goanalysis.TheOnlyanalyzerDoc, - Run: func(pass *analysis.Pass) (interface{}, error) { - var res []goanalysis.Issue - for _, file := range pass.Files { - fileIssues := checkFileForGlobals(file, pass.Fset) - for i := range fileIssues { - res = append(res, goanalysis.NewIssue(&fileIssues[i], pass)) - } - } - if len(res) == 0 { - return nil, nil - } - - mu.Lock() - resIssues = append(resIssues, res...) - mu.Unlock() + gochecknoglobals := checknoglobals.Analyzer() - return nil, nil - }, - } return goanalysis.NewLinter( - gochecknoglobalsName, - "Checks that no globals are present in Go code", - []*analysis.Analyzer{analyzer}, + gochecknoglobals.Name, + gochecknoglobals.Doc, + []*analysis.Analyzer{gochecknoglobals}, nil, - ).WithIssuesReporter(func(*linter.Context) []goanalysis.Issue { - return resIssues - }).WithLoadMode(goanalysis.LoadModeSyntax) -} - -func checkFileForGlobals(f *ast.File, fset *token.FileSet) []result.Issue { - var res []result.Issue - for _, decl := range f.Decls { - genDecl, ok := decl.(*ast.GenDecl) - if !ok { - continue - } - if genDecl.Tok != token.VAR { - continue - } - - for _, spec := range genDecl.Specs { - valueSpec := spec.(*ast.ValueSpec) - for _, vn := range valueSpec.Names { - if isWhitelisted(vn) { - continue - } - - res = append(res, result.Issue{ - Pos: fset.Position(vn.Pos()), - Text: fmt.Sprintf("%s is a global variable", formatCode(vn.Name, nil)), - FromLinter: gochecknoglobalsName, - }) - } - } - } - - return res -} - -func isWhitelisted(i *ast.Ident) bool { - return i.Name == "_" || i.Name == "version" || looksLikeError(i) -} - -// looksLikeError returns true if the AST identifier starts -// with 'err' or 'Err', or false otherwise. -// -// TODO: https://github.com/leighmcculloch/gochecknoglobals/issues/5 -func looksLikeError(i *ast.Ident) bool { - prefix := "err" - if i.IsExported() { - prefix = "Err" - } - return strings.HasPrefix(i.Name, prefix) + ).WithLoadMode(goanalysis.LoadModeSyntax) } diff --git a/test/testdata/gochecknoglobals.go b/test/testdata/gochecknoglobals.go index d802bee3f0da..02a1ab7b72e1 100644 --- a/test/testdata/gochecknoglobals.go +++ b/test/testdata/gochecknoglobals.go @@ -4,11 +4,17 @@ package testdata import ( "errors" "fmt" + "regexp" ) -var noGlobalsVar int // ERROR "`noGlobalsVar` is a global variable" +var noGlobalsVar int // ERROR "noGlobalsVar is a global variable" var ErrSomeType = errors.New("test that global erorrs aren't warned") +var ( + OnlyDigites = regexp.MustCompile(`^\d+$`) + BadNamedErr = errors.New("this is bad") // ERROR "BadNamedErr is a global variable" +) + func NoGlobals() { fmt.Print(noGlobalsVar) } From 6a04c418229160498770e1d312a73d5ba25ee07a Mon Sep 17 00:00:00 2001 From: Simon Sawert Date: Sat, 10 Oct 2020 12:49:57 +0200 Subject: [PATCH 2/7] Adress linting issues --- pkg/golinters/gochecknoglobals.go | 1 + pkg/golinters/gochecknoinits.go | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/golinters/gochecknoglobals.go b/pkg/golinters/gochecknoglobals.go index 4cd405428d87..d5d44cd439b7 100644 --- a/pkg/golinters/gochecknoglobals.go +++ b/pkg/golinters/gochecknoglobals.go @@ -4,6 +4,7 @@ import ( "golang.org/x/tools/go/analysis" "4d63.com/gochecknoglobals/checknoglobals" + "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" ) diff --git a/pkg/golinters/gochecknoinits.go b/pkg/golinters/gochecknoinits.go index 18465b13068e..f9715bda8683 100644 --- a/pkg/golinters/gochecknoinits.go +++ b/pkg/golinters/gochecknoinits.go @@ -15,7 +15,6 @@ import ( const gochecknoinitsName = "gochecknoinits" -//nolint:dupl func NewGochecknoinits() *goanalysis.Linter { var mu sync.Mutex var resIssues []goanalysis.Issue From f46c578a78d03cbed180de35c88ec3e40f462517 Mon Sep 17 00:00:00 2001 From: Simon Sawert Date: Sat, 10 Oct 2020 13:07:31 +0200 Subject: [PATCH 3/7] gochecknoglobals is no longer internal --- test/testdata/testpackage_internal_test.go | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 test/testdata/testpackage_internal_test.go diff --git a/test/testdata/testpackage_internal_test.go b/test/testdata/testpackage_internal_test.go deleted file mode 100644 index 2ddff77da4a6..000000000000 --- a/test/testdata/testpackage_internal_test.go +++ /dev/null @@ -1,6 +0,0 @@ -//args: -Etestpackage -Egochecknoglobals -package testdata - -// Test expects at least one issue in the file. -// So we have to add global variable and enable gochecknoglobals. -var global = `global` // ERROR "`global` is a global variable" From a60b4ee9eb4bf9bb800e6008b118f4714849d036 Mon Sep 17 00:00:00 2001 From: Simon Sawert Date: Sun, 11 Oct 2020 23:41:11 +0200 Subject: [PATCH 4/7] Always include include tests in the analyser --- pkg/golinters/gochecknoglobals.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkg/golinters/gochecknoglobals.go b/pkg/golinters/gochecknoglobals.go index d5d44cd439b7..7ae97675db70 100644 --- a/pkg/golinters/gochecknoglobals.go +++ b/pkg/golinters/gochecknoglobals.go @@ -1,6 +1,8 @@ package golinters import ( + "flag" + "golang.org/x/tools/go/analysis" "4d63.com/gochecknoglobals/checknoglobals" @@ -9,7 +11,15 @@ import ( ) func NewGochecknoglobals() *goanalysis.Linter { + // gochecknoglobals only lints test files if the `-t` flag is passed so we + // set up our own FlagSet and add it to the analyzer before running it. This + // can be turned of by using the regular golangci-lint flags such as + // `--tests` or `--skip-files`. + flags := flag.NewFlagSet("", flag.ContinueOnError) + flags.Bool("t", true, "Include tests") + gochecknoglobals := checknoglobals.Analyzer() + gochecknoglobals.Flags = *flags return goanalysis.NewLinter( gochecknoglobals.Name, From 617a591267a1f277d33e8f12e9ce5c1caa282ebd Mon Sep 17 00:00:00 2001 From: Simon Sawert Date: Mon, 12 Oct 2020 13:51:57 +0200 Subject: [PATCH 5/7] Use proper way to configure linter --- pkg/golinters/gochecknoglobals.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkg/golinters/gochecknoglobals.go b/pkg/golinters/gochecknoglobals.go index 7ae97675db70..37fed44849a9 100644 --- a/pkg/golinters/gochecknoglobals.go +++ b/pkg/golinters/gochecknoglobals.go @@ -1,8 +1,6 @@ package golinters import ( - "flag" - "golang.org/x/tools/go/analysis" "4d63.com/gochecknoglobals/checknoglobals" @@ -11,20 +9,22 @@ import ( ) func NewGochecknoglobals() *goanalysis.Linter { - // gochecknoglobals only lints test files if the `-t` flag is passed so we - // set up our own FlagSet and add it to the analyzer before running it. This - // can be turned of by using the regular golangci-lint flags such as - // `--tests` or `--skip-files`. - flags := flag.NewFlagSet("", flag.ContinueOnError) - flags.Bool("t", true, "Include tests") - gochecknoglobals := checknoglobals.Analyzer() - gochecknoglobals.Flags = *flags + + // gochecknoglobals only lints test files if the `-t` flag is passed so we + // pass the `t` flag as true to the analyzer before running it. This can be + // turned of by using the regular golangci-lint flags such as `--tests` or + // `--skip-files`. + linterConfig := map[string]map[string]interface{}{ + gochecknoglobals.Name: { + "t": true, + }, + } return goanalysis.NewLinter( gochecknoglobals.Name, gochecknoglobals.Doc, []*analysis.Analyzer{gochecknoglobals}, - nil, + linterConfig, ).WithLoadMode(goanalysis.LoadModeSyntax) } From 8bc840eb9acb09b4157913b188c91f8e8d50ba68 Mon Sep 17 00:00:00 2001 From: Simon Sawert Date: Mon, 12 Oct 2020 18:39:12 +0200 Subject: [PATCH 6/7] Fix go.mod --- go.mod | 6 ++++-- go.sum | 11 +++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 3b18554f52e2..965799ffb132 100644 --- a/go.mod +++ b/go.mod @@ -33,6 +33,7 @@ require ( github.com/maratori/testpackage v1.0.1 github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb // v1.0 github.com/mattn/go-colorable v0.1.8 + github.com/mbilski/exhaustivestruct v1.0.1 github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/go-ps v1.0.0 github.com/moricho/tparallel v0.2.1 @@ -45,9 +46,9 @@ require ( github.com/securego/gosec/v2 v2.4.0 github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada // v2.19.8 - github.com/sirupsen/logrus v1.6.0 + github.com/sirupsen/logrus v1.7.0 github.com/sonatard/noctx v0.0.1 - github.com/sourcegraph/go-diff v0.6.0 + github.com/sourcegraph/go-diff v0.6.1 github.com/spf13/cobra v1.0.1-0.20200916152758-7f8e83d9366a github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.7.1 @@ -62,6 +63,7 @@ require ( github.com/ultraware/whitespace v0.0.4 github.com/uudashr/gocognit v1.0.1 github.com/valyala/quicktemplate v1.6.3 + golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 // indirect golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d gopkg.in/yaml.v2 v2.3.0 honnef.co/go/tools v0.0.1-2020.1.5 diff --git a/go.sum b/go.sum index b06e2da0104d..7c6886fdff4e 100644 --- a/go.sum +++ b/go.sum @@ -247,6 +247,8 @@ github.com/mattn/go-sqlite3 v1.9.0 h1:pDRiWfl+++eC2FEFRy6jXmQlvp4Yh3z1MJKg4UeYM/ github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mbilski/exhaustivestruct v1.0.1 h1:FouWZOuwqC4YFgkbODefMA0lcuTLKArZLLpzKzjCMF0= +github.com/mbilski/exhaustivestruct v1.0.1/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -339,6 +341,8 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= @@ -346,8 +350,8 @@ github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/sonatard/noctx v0.0.1 h1:VC1Qhl6Oxx9vvWo3UDgrGXYCeKCe3Wbw7qAWL6FrmTY= github.com/sonatard/noctx v0.0.1/go.mod h1:9D2D/EoULe8Yy2joDHJj7bv3sZoq9AaSb8B4lqBjiZI= -github.com/sourcegraph/go-diff v0.6.0 h1:WbN9e/jD8ujU+o0vd9IFN5AEwtfB0rn/zM/AANaClqQ= -github.com/sourcegraph/go-diff v0.6.0/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= +github.com/sourcegraph/go-diff v0.6.1 h1:hmA1LzxW0n1c3Q4YbrFgg4P99GSnebYa3x8gr0HZqLQ= +github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= @@ -496,6 +500,8 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 h1:OjiUf46hAmXblsZdnoSXsEUSKU8r1UEzcL5RVZ4gO9Y= golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM= +golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= @@ -544,6 +550,7 @@ golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200731060945-b5fad4ed8dd6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200812195022-5ae4c3c160a0/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200831203904-5a2aa26beb65/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d h1:vWQvJ/Z0Lu+9/8oQ/pAYXNzbc7CMnBl+tULGVHOy3oE= golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From f1cadc757d2fd2de1db8912ffa710b6e97d9c346 Mon Sep 17 00:00:00 2001 From: Simon Sawert Date: Wed, 14 Oct 2020 17:50:05 +0200 Subject: [PATCH 7/7] Fix go.mod - again --- go.mod | 2 +- go.sum | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 720b54d1cef4..5d0fedc4a91a 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( github.com/uudashr/gocognit v1.0.1 github.com/valyala/quicktemplate v1.6.3 golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 // indirect - golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d + golang.org/x/tools v0.0.0-20201013201025-64a9e34f3752 gopkg.in/yaml.v2 v2.3.0 honnef.co/go/tools v0.0.1-2020.1.5 mvdan.cc/gofumpt v0.0.0-20200802201014-ab5a8192947d diff --git a/go.sum b/go.sum index df827b1c2c10..7567681c054d 100644 --- a/go.sum +++ b/go.sum @@ -552,6 +552,9 @@ golang.org/x/tools v0.0.0-20200831203904-5a2aa26beb65/go.mod h1:Cj7w3i3Rnn0Xh82u golang.org/x/tools v0.0.0-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d h1:vWQvJ/Z0Lu+9/8oQ/pAYXNzbc7CMnBl+tULGVHOy3oE= golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201011145850-ed2f50202694/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.0.0-20201013201025-64a9e34f3752 h1:2ntEwh02rqo2jSsrYmp4yKHHjh0CbXP3ZtSUetSB+q8= +golang.org/x/tools v0.0.0-20201013201025-64a9e34f3752/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=