Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Code Quality Improvements #1197

Merged
merged 7 commits into from
Apr 11, 2022
Merged

Code Quality Improvements #1197

merged 7 commits into from
Apr 11, 2022

Conversation

sluongng
Copy link
Contributor

This PR is composed of multiple commits which aimed to clean up the code base according to the lint result of running staticcheck and golangci-lint and gofumpt over the Gazelle repository. It's best to review this PR per-commit instead of as a whole. There should be no functional changes as a result of this PR and exported interfaces were not touched.

> git log --oneline --reverse origin/master..HEAD
c8a1d88 Fix staticcheck ST1006
71a12aa fix ST1012
66f45db apply gofumpt
8c7397f fix U1000
2b03f00 fix S1011, S1017, SA9003, S1007, SA4009
035663f remove deadcode constants
11d9e29 (HEAD) fix errcheck

This was a results of me reading through the code base over the weekend while trying to make peace with my editor.
The code after should be a lot easier to read and maintained compared to before.

Worth to note that ST1005 was intentionally skipped as it does not make sense in most cases and generate a lot of noise.

> staticcheck ./...
cmd/fetch_repo/module.go:37:10: error strings should not end with punctuation or a newline (ST1005)
cmd/fetch_repo/vcs.go:34:15: error strings should not end with punctuation or a newline (ST1005)
cmd/gazelle/update-repos.go:63:10: error strings should not be capitalized (ST1005)
cmd/gazelle/update-repos.go:66:10: error strings should not be capitalized (ST1005)
cmd/gazelle/update-repos.go:90:11: error strings should not end with punctuation or a newline (ST1005)
cmd/gazelle/update-repos.go:98:11: error strings should not end with punctuation or a newline (ST1005)
cmd/gazelle/update-repos.go:324:15: error strings should not be capitalized (ST1005)
cmd/move_labels/move_labels.go:199:15: error strings should not be capitalized (ST1005)
cmd/move_labels/move_labels.go:214:15: error strings should not end with punctuation or a newline (ST1005)
cmd/move_labels/move_labels.go:222:15: error strings should not be capitalized (ST1005)
cmd/move_labels/move_labels.go:222:15: error strings should not end with punctuation or a newline (ST1005)
flag/flag.go:84:9: error strings should not be capitalized (ST1005)
language/proto/generate.go:187:14: error strings should not end with punctuation or a newline (ST1005)
merger/fix.go:186:9: error strings should not end with punctuation or a newline (ST1005)
repo/repo.go:263:15: error strings should not be capitalized (ST1005)
repo/repo.go:267:15: error strings should not be capitalized (ST1005)

Please let me know if these are too much noise and needed to split into smaller PRs instead.

linzhp
linzhp reviewed Apr 10, 2022
View reviewed changes
cmd/gazelle/fix_test.go Outdated Show resolved Hide resolved
@sluongng
Fix staticcheck ST1006
4af3356 
receiver name should not be an underscore, omit the name if it is unused
@sluongng
Copy link
Contributor Author

I pushed an update to this PR. Changes included:

  • Rebase on top of latest master to resolve merge conflict
  • Remove change where gofumpt being applied on generated code.
  • Applied suggest of @linzhp to reduce the scope of err variables added.

Here is a range diff for easier reviewing (Github PR is bad when you update multiple commits)

1:  c8a1d88 = 1:  4af3356 Fix staticcheck ST1006
2:  71a12aa = 2:  3dfdb7a fix ST1012
3:  66f45db ! 3:  324ea7e apply gofumpt
    @@ language/go/generate_test.go: proto_library(
      	}
      	f := rule.EmptyFile("test", "")
     
    + ## language/go/lang.go ##
    +@@ language/go/lang.go: const goName = "go"
    + 
    + type goLang struct {
    + 	// goPkgDirs is a set of relative paths to directories containing buildable
    +-	// Go code. If the value is false, it means the directory does not contain 
    ++	// Go code. If the value is false, it means the directory does not contain
    + 	// buildable Go code, but it has a subdir which does.
    + 	goPkgRels map[string]bool
    + }
    +
      ## language/go/modules.go ##
     @@ language/go/modules.go: func importReposFromModules(args language.ImportReposArgs) language.ImportReposR
      	// dependencies.
    @@ language/go/modules.go: func importReposFromModules(args language.ImportReposArg
      		}
      	}
     
    + ## language/go/resolve.go ##
    +@@ language/go/resolve.go: func ResolveGo(c *config.Config, ix *resolve.RuleIndex, rc *repo.RemoteCache, im
    + 	if gc.depMode == vendorMode {
    + 		return resolveVendored(gc, imp)
    + 	}
    +-	var resolveFn func (string) (string, string, error)
    ++	var resolveFn func(string) (string, string, error)
    + 	if gc.depMode == staticMode {
    + 		resolveFn = rc.RootStatic
    + 	} else if gc.moduleMode || pathWithoutSemver(imp) != "" {
    +
      ## language/go/resolve_test.go ##
     @@ language/go/resolve_test.go: go_library(
      )
    @@ language/go/resolve_test.go: go_binary(
      go_library(
          name = "go_default_library",
          srcs = ["lib.go"],
    -
    - ## language/go/std_package_list.go ##
    -@@
    --
    - /* Copyright 2017 The Bazel Authors. All rights reserved.
    - 
    - Licensed under the Apache License, Version 2.0 (the "License");
    -@@ language/go/std_package_list.go: limitations under the License.
    - package golang
    - 
    - var stdPackages = map[string]bool{
    --	"archive/tar": true,
    --	"archive/tar/testdata": true,
    --	"archive/zip": true,
    --	"archive/zip/testdata": true,
    --	"bufio": true,
    --	"builtin": true,
    --	"bytes": true,
    --	"cmd": true,
    --	"cmd/addr2line": true,
    --	"cmd/api": true,
    -+	"archive/tar":                         true,
    -+	"archive/tar/testdata":                true,
    -+	"archive/zip":                         true,
    -+	"archive/zip/testdata":                true,
    -+	"bufio":                               true,
    -+	"builtin":                             true,
    -+	"bytes":                               true,
    -+	"cmd":                                 true,
    -+	"cmd/addr2line":                       true,
    -+	"cmd/api":                             true,
    - 	"cmd/api/testdata/src/issue21181/dep": true,
    --	"cmd/api/testdata/src/issue21181/indirect": true,
    --	"cmd/api/testdata/src/issue21181/p": true,
    --	"cmd/api/testdata/src/issue29837/p": true,
    --	"cmd/api/testdata/src/pkg/p1": true,
    --	"cmd/api/testdata/src/pkg/p2": true,
    --	"cmd/api/testdata/src/pkg/p3": true,
    --	"cmd/asm": true,
    --	"cmd/asm/internal/arch": true,
    --	"cmd/asm/internal/asm": true,
    --	"cmd/asm/internal/asm/testdata": true,
    --	"cmd/asm/internal/asm/testdata/avx512enc": true,
    --	"cmd/asm/internal/flags": true,
    --	"cmd/asm/internal/lex": true,
    --	"cmd/buildid": true,
    --	"cmd/cgo": true,
    --	"cmd/compile": true,
    --	"cmd/compile/internal/abi": true,
    --	"cmd/compile/internal/amd64": true,
    --	"cmd/compile/internal/arm": true,
    --	"cmd/compile/internal/arm64": true,
    --	"cmd/compile/internal/base": true,
    --	"cmd/compile/internal/bitvec": true,
    --	"cmd/compile/internal/deadcode": true,
    --	"cmd/compile/internal/devirtualize": true,
    --	"cmd/compile/internal/dwarfgen": true,
    --	"cmd/compile/internal/escape": true,
    --	"cmd/compile/internal/gc": true,
    --	"cmd/compile/internal/importer": true,
    --	"cmd/compile/internal/importer/testdata": true,
    --	"cmd/compile/internal/importer/testdata/versions": true,
    --	"cmd/compile/internal/inline": true,
    --	"cmd/compile/internal/ir": true,
    --	"cmd/compile/internal/liveness": true,
    --	"cmd/compile/internal/logopt": true,
    --	"cmd/compile/internal/mips": true,
    --	"cmd/compile/internal/mips64": true,
    --	"cmd/compile/internal/noder": true,
    --	"cmd/compile/internal/objw": true,
    --	"cmd/compile/internal/pkginit": true,
    --	"cmd/compile/internal/ppc64": true,
    --	"cmd/compile/internal/reflectdata": true,
    --	"cmd/compile/internal/riscv64": true,
    --	"cmd/compile/internal/s390x": true,
    --	"cmd/compile/internal/ssa": true,
    --	"cmd/compile/internal/ssa/gen": true,
    --	"cmd/compile/internal/ssa/testdata": true,
    --	"cmd/compile/internal/ssagen": true,
    --	"cmd/compile/internal/staticdata": true,
    --	"cmd/compile/internal/staticinit": true,
    --	"cmd/compile/internal/syntax": true,
    --	"cmd/compile/internal/syntax/testdata": true,
    --	"cmd/compile/internal/syntax/testdata/go2": true,
    --	"cmd/compile/internal/test": true,
    --	"cmd/compile/internal/test/testdata": true,
    --	"cmd/compile/internal/test/testdata/gen": true,
    --	"cmd/compile/internal/test/testdata/reproducible": true,
    --	"cmd/compile/internal/typebits": true,
    --	"cmd/compile/internal/typecheck": true,
    --	"cmd/compile/internal/typecheck/builtin": true,
    --	"cmd/compile/internal/types": true,
    --	"cmd/compile/internal/types2": true,
    --	"cmd/compile/internal/types2/testdata": true,
    --	"cmd/compile/internal/types2/testdata/check": true,
    --	"cmd/compile/internal/types2/testdata/check/decls2": true,
    --	"cmd/compile/internal/types2/testdata/check/importdecl0": true,
    --	"cmd/compile/internal/types2/testdata/check/importdecl1": true,
    --	"cmd/compile/internal/types2/testdata/check/issue25008": true,
    --	"cmd/compile/internal/types2/testdata/examples": true,
    --	"cmd/compile/internal/types2/testdata/fixedbugs": true,
    --	"cmd/compile/internal/walk": true,
    --	"cmd/compile/internal/wasm": true,
    --	"cmd/compile/internal/x86": true,
    --	"cmd/cover": true,
    --	"cmd/cover/testdata": true,
    --	"cmd/cover/testdata/html": true,
    --	"cmd/dist": true,
    --	"cmd/doc": true,
    --	"cmd/doc/testdata": true,
    --	"cmd/doc/testdata/merge": true,
    --	"cmd/doc/testdata/nested": true,
    --	"cmd/doc/testdata/nested/empty": true,
    --	"cmd/doc/testdata/nested/nested": true,
    --	"cmd/fix": true,
    --	"cmd/go": true,
    --	"cmd/go/internal/auth": true,
    --	"cmd/go/internal/base": true,
    --	"cmd/go/internal/bug": true,
    --	"cmd/go/internal/cache": true,
    --	"cmd/go/internal/cfg": true,
    --	"cmd/go/internal/clean": true,
    --	"cmd/go/internal/cmdflag": true,
    --	"cmd/go/internal/doc": true,
    --	"cmd/go/internal/envcmd": true,
    --	"cmd/go/internal/fix": true,
    --	"cmd/go/internal/fmtcmd": true,
    --	"cmd/go/internal/fsys": true,
    --	"cmd/go/internal/generate": true,
    --	"cmd/go/internal/get": true,
    --	"cmd/go/internal/help": true,
    --	"cmd/go/internal/imports": true,
    --	"cmd/go/internal/imports/testdata/android": true,
    --	"cmd/go/internal/imports/testdata/illumos": true,
    --	"cmd/go/internal/imports/testdata/star": true,
    --	"cmd/go/internal/list": true,
    --	"cmd/go/internal/load": true,
    --	"cmd/go/internal/lockedfile": true,
    --	"cmd/go/internal/lockedfile/internal/filelock": true,
    --	"cmd/go/internal/modcmd": true,
    --	"cmd/go/internal/modconv": true,
    --	"cmd/go/internal/modconv/testdata": true,
    --	"cmd/go/internal/modfetch": true,
    --	"cmd/go/internal/modfetch/codehost": true,
    --	"cmd/go/internal/modfetch/zip_sum_test": true,
    --	"cmd/go/internal/modfetch/zip_sum_test/testdata": true,
    --	"cmd/go/internal/modget": true,
    --	"cmd/go/internal/modinfo": true,
    --	"cmd/go/internal/modload": true,
    --	"cmd/go/internal/mvs": true,
    --	"cmd/go/internal/par": true,
    --	"cmd/go/internal/robustio": true,
    --	"cmd/go/internal/run": true,
    --	"cmd/go/internal/search": true,
    --	"cmd/go/internal/str": true,
    --	"cmd/go/internal/test": true,
    --	"cmd/go/internal/tool": true,
    --	"cmd/go/internal/trace": true,
    --	"cmd/go/internal/txtar": true,
    --	"cmd/go/internal/vcs": true,
    --	"cmd/go/internal/version": true,
    --	"cmd/go/internal/vet": true,
    --	"cmd/go/internal/web": true,
    --	"cmd/go/internal/work": true,
    --	"cmd/go/testdata": true,
    --	"cmd/go/testdata/failssh": true,
    --	"cmd/go/testdata/mod": true,
    --	"cmd/go/testdata/modlegacy/src/new": true,
    --	"cmd/go/testdata/modlegacy/src/new/p1": true,
    --	"cmd/go/testdata/modlegacy/src/new/p2": true,
    --	"cmd/go/testdata/modlegacy/src/new/sub": true,
    --	"cmd/go/testdata/modlegacy/src/new/sub/inner": true,
    --	"cmd/go/testdata/modlegacy/src/new/sub/inner/x": true,
    --	"cmd/go/testdata/modlegacy/src/new/sub/x/v1/y": true,
    --	"cmd/go/testdata/modlegacy/src/old/p1": true,
    --	"cmd/go/testdata/modlegacy/src/old/p2": true,
    --	"cmd/go/testdata/script": true,
    --	"cmd/go/testdata/testterminal18153": true,
    --	"cmd/gofmt": true,
    --	"cmd/gofmt/testdata": true,
    --	"cmd/internal/archive": true,
    --	"cmd/internal/archive/testdata": true,
    --	"cmd/internal/archive/testdata/mycgo": true,
    --	"cmd/internal/bio": true,
    --	"cmd/internal/browser": true,
    --	"cmd/internal/buildid": true,
    --	"cmd/internal/buildid/testdata": true,
    --	"cmd/internal/codesign": true,
    --	"cmd/internal/diff": true,
    --	"cmd/internal/dwarf": true,
    --	"cmd/internal/edit": true,
    --	"cmd/internal/gcprog": true,
    --	"cmd/internal/goobj": true,
    --	"cmd/internal/moddeps": true,
    --	"cmd/internal/obj": true,
    --	"cmd/internal/obj/arm": true,
    --	"cmd/internal/obj/arm64": true,
    --	"cmd/internal/obj/mips": true,
    --	"cmd/internal/obj/ppc64": true,
    --	"cmd/internal/obj/riscv": true,
    --	"cmd/internal/obj/riscv/testdata/testbranch": true,
    --	"cmd/internal/obj/s390x": true,
    --	"cmd/internal/obj/wasm": true,
    --	"cmd/internal/obj/x86": true,
    --	"cmd/internal/objabi": true,
    --	"cmd/internal/objfile": true,
    --	"cmd/internal/pkgpath": true,
    --	"cmd/internal/src": true,
    --	"cmd/internal/sys": true,
    --	"cmd/internal/test2json": true,
    --	"cmd/internal/test2json/testdata": true,
    --	"cmd/internal/traceviewer": true,
    --	"cmd/link": true,
    --	"cmd/link/internal/amd64": true,
    --	"cmd/link/internal/arm": true,
    --	"cmd/link/internal/arm64": true,
    --	"cmd/link/internal/benchmark": true,
    --	"cmd/link/internal/ld": true,
    --	"cmd/link/internal/ld/testdata/deadcode": true,
    --	"cmd/link/internal/ld/testdata/httptest/main": true,
    --	"cmd/link/internal/ld/testdata/issue10978": true,
    --	"cmd/link/internal/ld/testdata/issue25459/a": true,
    --	"cmd/link/internal/ld/testdata/issue25459/main": true,
    --	"cmd/link/internal/ld/testdata/issue26237/b.dir": true,
    --	"cmd/link/internal/ld/testdata/issue26237/main": true,
    --	"cmd/link/internal/ld/testdata/issue32233/lib": true,
    --	"cmd/link/internal/ld/testdata/issue32233/main": true,
    --	"cmd/link/internal/ld/testdata/issue38192": true,
    --	"cmd/link/internal/ld/testdata/issue39256": true,
    --	"cmd/link/internal/ld/testdata/issue39757": true,
    --	"cmd/link/internal/ld/testdata/issue42484": true,
    --	"cmd/link/internal/loadelf": true,
    --	"cmd/link/internal/loader": true,
    --	"cmd/link/internal/loadmacho": true,
    --	"cmd/link/internal/loadpe": true,
    --	"cmd/link/internal/loadxcoff": true,
    --	"cmd/link/internal/mips": true,
    --	"cmd/link/internal/mips64": true,
    --	"cmd/link/internal/ppc64": true,
    --	"cmd/link/internal/riscv64": true,
    --	"cmd/link/internal/s390x": true,
    --	"cmd/link/internal/sym": true,
    --	"cmd/link/internal/wasm": true,
    --	"cmd/link/internal/x86": true,
    --	"cmd/link/testdata/pe-binutils": true,
    --	"cmd/link/testdata/pe-llvm": true,
    --	"cmd/link/testdata/testBuildFortvOS": true,
    --	"cmd/link/testdata/testHashedSyms": true,
    --	"cmd/link/testdata/testIndexMismatch": true,
    --	"cmd/link/testdata/testRO": true,
    --	"cmd/nm": true,
    --	"cmd/objdump": true,
    --	"cmd/objdump/testdata": true,
    --	"cmd/objdump/testdata/testfilenum": true,
    --	"cmd/pack": true,
    --	"cmd/pprof": true,
    --	"cmd/pprof/testdata": true,
    --	"cmd/test2json": true,
    --	"cmd/trace": true,
    --	"cmd/vendor": true,
    --	"cmd/vendor/github.com/google/pprof": true,
    --	"cmd/vendor/github.com/google/pprof/driver": true,
    --	"cmd/vendor/github.com/google/pprof/internal/binutils": true,
    --	"cmd/vendor/github.com/google/pprof/internal/driver": true,
    --	"cmd/vendor/github.com/google/pprof/internal/elfexec": true,
    --	"cmd/vendor/github.com/google/pprof/internal/graph": true,
    --	"cmd/vendor/github.com/google/pprof/internal/measurement": true,
    --	"cmd/vendor/github.com/google/pprof/internal/plugin": true,
    --	"cmd/vendor/github.com/google/pprof/internal/report": true,
    --	"cmd/vendor/github.com/google/pprof/internal/symbolizer": true,
    --	"cmd/vendor/github.com/google/pprof/internal/symbolz": true,
    --	"cmd/vendor/github.com/google/pprof/internal/transport": true,
    --	"cmd/vendor/github.com/google/pprof/profile": true,
    --	"cmd/vendor/github.com/google/pprof/third_party/d3": true,
    --	"cmd/vendor/github.com/google/pprof/third_party/d3flamegraph": true,
    --	"cmd/vendor/github.com/google/pprof/third_party/svgpan": true,
    --	"cmd/vendor/github.com/ianlancetaylor/demangle": true,
    --	"cmd/vendor/golang.org/x/arch": true,
    --	"cmd/vendor/golang.org/x/arch/arm/armasm": true,
    --	"cmd/vendor/golang.org/x/arch/arm64/arm64asm": true,
    --	"cmd/vendor/golang.org/x/arch/ppc64/ppc64asm": true,
    --	"cmd/vendor/golang.org/x/arch/x86/x86asm": true,
    --	"cmd/vendor/golang.org/x/crypto": true,
    --	"cmd/vendor/golang.org/x/crypto/ed25519": true,
    --	"cmd/vendor/golang.org/x/crypto/ed25519/internal/edwards25519": true,
    --	"cmd/vendor/golang.org/x/mod": true,
    --	"cmd/vendor/golang.org/x/mod/internal/lazyregexp": true,
    --	"cmd/vendor/golang.org/x/mod/modfile": true,
    --	"cmd/vendor/golang.org/x/mod/module": true,
    --	"cmd/vendor/golang.org/x/mod/semver": true,
    --	"cmd/vendor/golang.org/x/mod/sumdb": true,
    --	"cmd/vendor/golang.org/x/mod/sumdb/dirhash": true,
    --	"cmd/vendor/golang.org/x/mod/sumdb/note": true,
    --	"cmd/vendor/golang.org/x/mod/sumdb/tlog": true,
    --	"cmd/vendor/golang.org/x/mod/zip": true,
    --	"cmd/vendor/golang.org/x/sys": true,
    --	"cmd/vendor/golang.org/x/sys/internal/unsafeheader": true,
    --	"cmd/vendor/golang.org/x/sys/plan9": true,
    --	"cmd/vendor/golang.org/x/sys/unix": true,
    --	"cmd/vendor/golang.org/x/sys/windows": true,
    --	"cmd/vendor/golang.org/x/term": true,
    --	"cmd/vendor/golang.org/x/tools": true,
    --	"cmd/vendor/golang.org/x/tools/cover": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/internal/analysisflags": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/internal/facts": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/asmdecl": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/assign": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/atomic": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/bools": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/buildtag": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/cgocall": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/composite": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/copylock": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/ctrlflow": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/errorsas": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/framepointer": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/httpresponse": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/ifaceassert": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/inspect": true,
    -+	"cmd/api/testdata/src/issue21181/indirect":                               true,
    -+	"cmd/api/testdata/src/issue21181/p":                                      true,
    -+	"cmd/api/testdata/src/issue29837/p":                                      true,
    -+	"cmd/api/testdata/src/pkg/p1":                                            true,
    -+	"cmd/api/testdata/src/pkg/p2":                                            true,
    -+	"cmd/api/testdata/src/pkg/p3":                                            true,
    -+	"cmd/asm":                                                                true,
    -+	"cmd/asm/internal/arch":                                                  true,
    -+	"cmd/asm/internal/asm":                                                   true,
    -+	"cmd/asm/internal/asm/testdata":                                          true,
    -+	"cmd/asm/internal/asm/testdata/avx512enc":                                true,
    -+	"cmd/asm/internal/flags":                                                 true,
    -+	"cmd/asm/internal/lex":                                                   true,
    -+	"cmd/buildid":                                                            true,
    -+	"cmd/cgo":                                                                true,
    -+	"cmd/compile":                                                            true,
    -+	"cmd/compile/internal/abi":                                               true,
    -+	"cmd/compile/internal/amd64":                                             true,
    -+	"cmd/compile/internal/arm":                                               true,
    -+	"cmd/compile/internal/arm64":                                             true,
    -+	"cmd/compile/internal/base":                                              true,
    -+	"cmd/compile/internal/bitvec":                                            true,
    -+	"cmd/compile/internal/deadcode":                                          true,
    -+	"cmd/compile/internal/devirtualize":                                      true,
    -+	"cmd/compile/internal/dwarfgen":                                          true,
    -+	"cmd/compile/internal/escape":                                            true,
    -+	"cmd/compile/internal/gc":                                                true,
    -+	"cmd/compile/internal/importer":                                          true,
    -+	"cmd/compile/internal/importer/testdata":                                 true,
    -+	"cmd/compile/internal/importer/testdata/versions":                        true,
    -+	"cmd/compile/internal/inline":                                            true,
    -+	"cmd/compile/internal/ir":                                                true,
    -+	"cmd/compile/internal/liveness":                                          true,
    -+	"cmd/compile/internal/logopt":                                            true,
    -+	"cmd/compile/internal/mips":                                              true,
    -+	"cmd/compile/internal/mips64":                                            true,
    -+	"cmd/compile/internal/noder":                                             true,
    -+	"cmd/compile/internal/objw":                                              true,
    -+	"cmd/compile/internal/pkginit":                                           true,
    -+	"cmd/compile/internal/ppc64":                                             true,
    -+	"cmd/compile/internal/reflectdata":                                       true,
    -+	"cmd/compile/internal/riscv64":                                           true,
    -+	"cmd/compile/internal/s390x":                                             true,
    -+	"cmd/compile/internal/ssa":                                               true,
    -+	"cmd/compile/internal/ssa/gen":                                           true,
    -+	"cmd/compile/internal/ssa/testdata":                                      true,
    -+	"cmd/compile/internal/ssagen":                                            true,
    -+	"cmd/compile/internal/staticdata":                                        true,
    -+	"cmd/compile/internal/staticinit":                                        true,
    -+	"cmd/compile/internal/syntax":                                            true,
    -+	"cmd/compile/internal/syntax/testdata":                                   true,
    -+	"cmd/compile/internal/syntax/testdata/go2":                               true,
    -+	"cmd/compile/internal/test":                                              true,
    -+	"cmd/compile/internal/test/testdata":                                     true,
    -+	"cmd/compile/internal/test/testdata/gen":                                 true,
    -+	"cmd/compile/internal/test/testdata/reproducible":                        true,
    -+	"cmd/compile/internal/typebits":                                          true,
    -+	"cmd/compile/internal/typecheck":                                         true,
    -+	"cmd/compile/internal/typecheck/builtin":                                 true,
    -+	"cmd/compile/internal/types":                                             true,
    -+	"cmd/compile/internal/types2":                                            true,
    -+	"cmd/compile/internal/types2/testdata":                                   true,
    -+	"cmd/compile/internal/types2/testdata/check":                             true,
    -+	"cmd/compile/internal/types2/testdata/check/decls2":                      true,
    -+	"cmd/compile/internal/types2/testdata/check/importdecl0":                 true,
    -+	"cmd/compile/internal/types2/testdata/check/importdecl1":                 true,
    -+	"cmd/compile/internal/types2/testdata/check/issue25008":                  true,
    -+	"cmd/compile/internal/types2/testdata/examples":                          true,
    -+	"cmd/compile/internal/types2/testdata/fixedbugs":                         true,
    -+	"cmd/compile/internal/walk":                                              true,
    -+	"cmd/compile/internal/wasm":                                              true,
    -+	"cmd/compile/internal/x86":                                               true,
    -+	"cmd/cover":                                                              true,
    -+	"cmd/cover/testdata":                                                     true,
    -+	"cmd/cover/testdata/html":                                                true,
    -+	"cmd/dist":                                                               true,
    -+	"cmd/doc":                                                                true,
    -+	"cmd/doc/testdata":                                                       true,
    -+	"cmd/doc/testdata/merge":                                                 true,
    -+	"cmd/doc/testdata/nested":                                                true,
    -+	"cmd/doc/testdata/nested/empty":                                          true,
    -+	"cmd/doc/testdata/nested/nested":                                         true,
    -+	"cmd/fix":                                                                true,
    -+	"cmd/go":                                                                 true,
    -+	"cmd/go/internal/auth":                                                   true,
    -+	"cmd/go/internal/base":                                                   true,
    -+	"cmd/go/internal/bug":                                                    true,
    -+	"cmd/go/internal/cache":                                                  true,
    -+	"cmd/go/internal/cfg":                                                    true,
    -+	"cmd/go/internal/clean":                                                  true,
    -+	"cmd/go/internal/cmdflag":                                                true,
    -+	"cmd/go/internal/doc":                                                    true,
    -+	"cmd/go/internal/envcmd":                                                 true,
    -+	"cmd/go/internal/fix":                                                    true,
    -+	"cmd/go/internal/fmtcmd":                                                 true,
    -+	"cmd/go/internal/fsys":                                                   true,
    -+	"cmd/go/internal/generate":                                               true,
    -+	"cmd/go/internal/get":                                                    true,
    -+	"cmd/go/internal/help":                                                   true,
    -+	"cmd/go/internal/imports":                                                true,
    -+	"cmd/go/internal/imports/testdata/android":                               true,
    -+	"cmd/go/internal/imports/testdata/illumos":                               true,
    -+	"cmd/go/internal/imports/testdata/star":                                  true,
    -+	"cmd/go/internal/list":                                                   true,
    -+	"cmd/go/internal/load":                                                   true,
    -+	"cmd/go/internal/lockedfile":                                             true,
    -+	"cmd/go/internal/lockedfile/internal/filelock":                           true,
    -+	"cmd/go/internal/modcmd":                                                 true,
    -+	"cmd/go/internal/modconv":                                                true,
    -+	"cmd/go/internal/modconv/testdata":                                       true,
    -+	"cmd/go/internal/modfetch":                                               true,
    -+	"cmd/go/internal/modfetch/codehost":                                      true,
    -+	"cmd/go/internal/modfetch/zip_sum_test":                                  true,
    -+	"cmd/go/internal/modfetch/zip_sum_test/testdata":                         true,
    -+	"cmd/go/internal/modget":                                                 true,
    -+	"cmd/go/internal/modinfo":                                                true,
    -+	"cmd/go/internal/modload":                                                true,
    -+	"cmd/go/internal/mvs":                                                    true,
    -+	"cmd/go/internal/par":                                                    true,
    -+	"cmd/go/internal/robustio":                                               true,
    -+	"cmd/go/internal/run":                                                    true,
    -+	"cmd/go/internal/search":                                                 true,
    -+	"cmd/go/internal/str":                                                    true,
    -+	"cmd/go/internal/test":                                                   true,
    -+	"cmd/go/internal/tool":                                                   true,
    -+	"cmd/go/internal/trace":                                                  true,
    -+	"cmd/go/internal/txtar":                                                  true,
    -+	"cmd/go/internal/vcs":                                                    true,
    -+	"cmd/go/internal/version":                                                true,
    -+	"cmd/go/internal/vet":                                                    true,
    -+	"cmd/go/internal/web":                                                    true,
    -+	"cmd/go/internal/work":                                                   true,
    -+	"cmd/go/testdata":                                                        true,
    -+	"cmd/go/testdata/failssh":                                                true,
    -+	"cmd/go/testdata/mod":                                                    true,
    -+	"cmd/go/testdata/modlegacy/src/new":                                      true,
    -+	"cmd/go/testdata/modlegacy/src/new/p1":                                   true,
    -+	"cmd/go/testdata/modlegacy/src/new/p2":                                   true,
    -+	"cmd/go/testdata/modlegacy/src/new/sub":                                  true,
    -+	"cmd/go/testdata/modlegacy/src/new/sub/inner":                            true,
    -+	"cmd/go/testdata/modlegacy/src/new/sub/inner/x":                          true,
    -+	"cmd/go/testdata/modlegacy/src/new/sub/x/v1/y":                           true,
    -+	"cmd/go/testdata/modlegacy/src/old/p1":                                   true,
    -+	"cmd/go/testdata/modlegacy/src/old/p2":                                   true,
    -+	"cmd/go/testdata/script":                                                 true,
    -+	"cmd/go/testdata/testterminal18153":                                      true,
    -+	"cmd/gofmt":                                                              true,
    -+	"cmd/gofmt/testdata":                                                     true,
    -+	"cmd/internal/archive":                                                   true,
    -+	"cmd/internal/archive/testdata":                                          true,
    -+	"cmd/internal/archive/testdata/mycgo":                                    true,
    -+	"cmd/internal/bio":                                                       true,
    -+	"cmd/internal/browser":                                                   true,
    -+	"cmd/internal/buildid":                                                   true,
    -+	"cmd/internal/buildid/testdata":                                          true,
    -+	"cmd/internal/codesign":                                                  true,
    -+	"cmd/internal/diff":                                                      true,
    -+	"cmd/internal/dwarf":                                                     true,
    -+	"cmd/internal/edit":                                                      true,
    -+	"cmd/internal/gcprog":                                                    true,
    -+	"cmd/internal/goobj":                                                     true,
    -+	"cmd/internal/moddeps":                                                   true,
    -+	"cmd/internal/obj":                                                       true,
    -+	"cmd/internal/obj/arm":                                                   true,
    -+	"cmd/internal/obj/arm64":                                                 true,
    -+	"cmd/internal/obj/mips":                                                  true,
    -+	"cmd/internal/obj/ppc64":                                                 true,
    -+	"cmd/internal/obj/riscv":                                                 true,
    -+	"cmd/internal/obj/riscv/testdata/testbranch":                             true,
    -+	"cmd/internal/obj/s390x":                                                 true,
    -+	"cmd/internal/obj/wasm":                                                  true,
    -+	"cmd/internal/obj/x86":                                                   true,
    -+	"cmd/internal/objabi":                                                    true,
    -+	"cmd/internal/objfile":                                                   true,
    -+	"cmd/internal/pkgpath":                                                   true,
    -+	"cmd/internal/src":                                                       true,
    -+	"cmd/internal/sys":                                                       true,
    -+	"cmd/internal/test2json":                                                 true,
    -+	"cmd/internal/test2json/testdata":                                        true,
    -+	"cmd/internal/traceviewer":                                               true,
    -+	"cmd/link":                                                               true,
    -+	"cmd/link/internal/amd64":                                                true,
    -+	"cmd/link/internal/arm":                                                  true,
    -+	"cmd/link/internal/arm64":                                                true,
    -+	"cmd/link/internal/benchmark":                                            true,
    -+	"cmd/link/internal/ld":                                                   true,
    -+	"cmd/link/internal/ld/testdata/deadcode":                                 true,
    -+	"cmd/link/internal/ld/testdata/httptest/main":                            true,
    -+	"cmd/link/internal/ld/testdata/issue10978":                               true,
    -+	"cmd/link/internal/ld/testdata/issue25459/a":                             true,
    -+	"cmd/link/internal/ld/testdata/issue25459/main":                          true,
    -+	"cmd/link/internal/ld/testdata/issue26237/b.dir":                         true,
    -+	"cmd/link/internal/ld/testdata/issue26237/main":                          true,
    -+	"cmd/link/internal/ld/testdata/issue32233/lib":                           true,
    -+	"cmd/link/internal/ld/testdata/issue32233/main":                          true,
    -+	"cmd/link/internal/ld/testdata/issue38192":                               true,
    -+	"cmd/link/internal/ld/testdata/issue39256":                               true,
    -+	"cmd/link/internal/ld/testdata/issue39757":                               true,
    -+	"cmd/link/internal/ld/testdata/issue42484":                               true,
    -+	"cmd/link/internal/loadelf":                                              true,
    -+	"cmd/link/internal/loader":                                               true,
    -+	"cmd/link/internal/loadmacho":                                            true,
    -+	"cmd/link/internal/loadpe":                                               true,
    -+	"cmd/link/internal/loadxcoff":                                            true,
    -+	"cmd/link/internal/mips":                                                 true,
    -+	"cmd/link/internal/mips64":                                               true,
    -+	"cmd/link/internal/ppc64":                                                true,
    -+	"cmd/link/internal/riscv64":                                              true,
    -+	"cmd/link/internal/s390x":                                                true,
    -+	"cmd/link/internal/sym":                                                  true,
    -+	"cmd/link/internal/wasm":                                                 true,
    -+	"cmd/link/internal/x86":                                                  true,
    -+	"cmd/link/testdata/pe-binutils":                                          true,
    -+	"cmd/link/testdata/pe-llvm":                                              true,
    -+	"cmd/link/testdata/testBuildFortvOS":                                     true,
    -+	"cmd/link/testdata/testHashedSyms":                                       true,
    -+	"cmd/link/testdata/testIndexMismatch":                                    true,
    -+	"cmd/link/testdata/testRO":                                               true,
    -+	"cmd/nm":                                                                 true,
    -+	"cmd/objdump":                                                            true,
    -+	"cmd/objdump/testdata":                                                   true,
    -+	"cmd/objdump/testdata/testfilenum":                                       true,
    -+	"cmd/pack":                                                               true,
    -+	"cmd/pprof":                                                              true,
    -+	"cmd/pprof/testdata":                                                     true,
    -+	"cmd/test2json":                                                          true,
    -+	"cmd/trace":                                                              true,
    -+	"cmd/vendor":                                                             true,
    -+	"cmd/vendor/github.com/google/pprof":                                     true,
    -+	"cmd/vendor/github.com/google/pprof/driver":                              true,
    -+	"cmd/vendor/github.com/google/pprof/internal/binutils":                   true,
    -+	"cmd/vendor/github.com/google/pprof/internal/driver":                     true,
    -+	"cmd/vendor/github.com/google/pprof/internal/elfexec":                    true,
    -+	"cmd/vendor/github.com/google/pprof/internal/graph":                      true,
    -+	"cmd/vendor/github.com/google/pprof/internal/measurement":                true,
    -+	"cmd/vendor/github.com/google/pprof/internal/plugin":                     true,
    -+	"cmd/vendor/github.com/google/pprof/internal/report":                     true,
    -+	"cmd/vendor/github.com/google/pprof/internal/symbolizer":                 true,
    -+	"cmd/vendor/github.com/google/pprof/internal/symbolz":                    true,
    -+	"cmd/vendor/github.com/google/pprof/internal/transport":                  true,
    -+	"cmd/vendor/github.com/google/pprof/profile":                             true,
    -+	"cmd/vendor/github.com/google/pprof/third_party/d3":                      true,
    -+	"cmd/vendor/github.com/google/pprof/third_party/d3flamegraph":            true,
    -+	"cmd/vendor/github.com/google/pprof/third_party/svgpan":                  true,
    -+	"cmd/vendor/github.com/ianlancetaylor/demangle":                          true,
    -+	"cmd/vendor/golang.org/x/arch":                                           true,
    -+	"cmd/vendor/golang.org/x/arch/arm/armasm":                                true,
    -+	"cmd/vendor/golang.org/x/arch/arm64/arm64asm":                            true,
    -+	"cmd/vendor/golang.org/x/arch/ppc64/ppc64asm":                            true,
    -+	"cmd/vendor/golang.org/x/arch/x86/x86asm":                                true,
    -+	"cmd/vendor/golang.org/x/crypto":                                         true,
    -+	"cmd/vendor/golang.org/x/crypto/ed25519":                                 true,
    -+	"cmd/vendor/golang.org/x/crypto/ed25519/internal/edwards25519":           true,
    -+	"cmd/vendor/golang.org/x/mod":                                            true,
    -+	"cmd/vendor/golang.org/x/mod/internal/lazyregexp":                        true,
    -+	"cmd/vendor/golang.org/x/mod/modfile":                                    true,
    -+	"cmd/vendor/golang.org/x/mod/module":                                     true,
    -+	"cmd/vendor/golang.org/x/mod/semver":                                     true,
    -+	"cmd/vendor/golang.org/x/mod/sumdb":                                      true,
    -+	"cmd/vendor/golang.org/x/mod/sumdb/dirhash":                              true,
    -+	"cmd/vendor/golang.org/x/mod/sumdb/note":                                 true,
    -+	"cmd/vendor/golang.org/x/mod/sumdb/tlog":                                 true,
    -+	"cmd/vendor/golang.org/x/mod/zip":                                        true,
    -+	"cmd/vendor/golang.org/x/sys":                                            true,
    -+	"cmd/vendor/golang.org/x/sys/internal/unsafeheader":                      true,
    -+	"cmd/vendor/golang.org/x/sys/plan9":                                      true,
    -+	"cmd/vendor/golang.org/x/sys/unix":                                       true,
    -+	"cmd/vendor/golang.org/x/sys/windows":                                    true,
    -+	"cmd/vendor/golang.org/x/term":                                           true,
    -+	"cmd/vendor/golang.org/x/tools":                                          true,
    -+	"cmd/vendor/golang.org/x/tools/cover":                                    true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis":                              true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/internal/analysisflags":       true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/internal/facts":               true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/asmdecl":               true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/assign":                true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/atomic":                true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/bools":                 true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/buildtag":              true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/cgocall":               true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/composite":             true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/copylock":              true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/ctrlflow":              true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/errorsas":              true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/framepointer":          true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/httpresponse":          true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/ifaceassert":           true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/inspect":               true,
    - 	"cmd/vendor/golang.org/x/tools/go/analysis/passes/internal/analysisutil": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/loopclosure": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/lostcancel": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/nilfunc": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/printf": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/shift": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/sigchanyzer": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/stdmethods": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/stringintconv": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/structtag": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/testinggoroutine": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/tests": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/unmarshal": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/unreachable": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/unsafeptr": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/passes/unusedresult": true,
    --	"cmd/vendor/golang.org/x/tools/go/analysis/unitchecker": true,
    --	"cmd/vendor/golang.org/x/tools/go/ast/astutil": true,
    --	"cmd/vendor/golang.org/x/tools/go/ast/inspector": true,
    --	"cmd/vendor/golang.org/x/tools/go/cfg": true,
    --	"cmd/vendor/golang.org/x/tools/go/types/objectpath": true,
    --	"cmd/vendor/golang.org/x/tools/go/types/typeutil": true,
    --	"cmd/vendor/golang.org/x/tools/internal/analysisinternal": true,
    --	"cmd/vendor/golang.org/x/tools/internal/lsp/fuzzy": true,
    --	"cmd/vendor/golang.org/x/xerrors": true,
    --	"cmd/vendor/golang.org/x/xerrors/internal": true,
    --	"cmd/vet": true,
    --	"cmd/vet/testdata/asm": true,
    --	"cmd/vet/testdata/assign": true,
    --	"cmd/vet/testdata/atomic": true,
    --	"cmd/vet/testdata/bool": true,
    --	"cmd/vet/testdata/buildtag": true,
    --	"cmd/vet/testdata/cgo": true,
    --	"cmd/vet/testdata/composite": true,
    --	"cmd/vet/testdata/copylock": true,
    --	"cmd/vet/testdata/deadcode": true,
    --	"cmd/vet/testdata/httpresponse": true,
    --	"cmd/vet/testdata/lostcancel": true,
    --	"cmd/vet/testdata/method": true,
    --	"cmd/vet/testdata/nilfunc": true,
    --	"cmd/vet/testdata/print": true,
    --	"cmd/vet/testdata/rangeloop": true,
    --	"cmd/vet/testdata/shift": true,
    --	"cmd/vet/testdata/structtag": true,
    --	"cmd/vet/testdata/tagtest": true,
    --	"cmd/vet/testdata/testingpkg": true,
    --	"cmd/vet/testdata/unmarshal": true,
    --	"cmd/vet/testdata/unsafeptr": true,
    --	"cmd/vet/testdata/unused": true,
    --	"compress/bzip2": true,
    --	"compress/bzip2/testdata": true,
    --	"compress/flate": true,
    --	"compress/flate/testdata": true,
    --	"compress/gzip": true,
    --	"compress/gzip/testdata": true,
    --	"compress/lzw": true,
    --	"compress/testdata": true,
    --	"compress/zlib": true,
    --	"container/heap": true,
    --	"container/list": true,
    --	"container/ring": true,
    --	"context": true,
    --	"crypto": true,
    --	"crypto/aes": true,
    --	"crypto/cipher": true,
    --	"crypto/des": true,
    --	"crypto/dsa": true,
    --	"crypto/ecdsa": true,
    --	"crypto/ecdsa/testdata": true,
    --	"crypto/ed25519": true,
    --	"crypto/ed25519/internal/edwards25519": true,
    --	"crypto/ed25519/internal/edwards25519/field": true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/loopclosure":           true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/lostcancel":            true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/nilfunc":               true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/printf":                true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/shift":                 true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/sigchanyzer":           true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/stdmethods":            true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/stringintconv":         true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/structtag":             true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/testinggoroutine":      true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/tests":                 true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/unmarshal":             true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/unreachable":           true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/unsafeptr":             true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/passes/unusedresult":          true,
    -+	"cmd/vendor/golang.org/x/tools/go/analysis/unitchecker":                  true,
    -+	"cmd/vendor/golang.org/x/tools/go/ast/astutil":                           true,
    -+	"cmd/vendor/golang.org/x/tools/go/ast/inspector":                         true,
    -+	"cmd/vendor/golang.org/x/tools/go/cfg":                                   true,
    -+	"cmd/vendor/golang.org/x/tools/go/types/objectpath":                      true,
    -+	"cmd/vendor/golang.org/x/tools/go/types/typeutil":                        true,
    -+	"cmd/vendor/golang.org/x/tools/internal/analysisinternal":                true,
    -+	"cmd/vendor/golang.org/x/tools/internal/lsp/fuzzy":                       true,
    -+	"cmd/vendor/golang.org/x/xerrors":                                        true,
    -+	"cmd/vendor/golang.org/x/xerrors/internal":                               true,
    -+	"cmd/vet":                                         true,
    -+	"cmd/vet/testdata/asm":                            true,
    -+	"cmd/vet/testdata/assign":                         true,
    -+	"cmd/vet/testdata/atomic":                         true,
    -+	"cmd/vet/testdata/bool":                           true,
    -+	"cmd/vet/testdata/buildtag":                       true,
    -+	"cmd/vet/testdata/cgo":                            true,
    -+	"cmd/vet/testdata/composite":                      true,
    -+	"cmd/vet/testdata/copylock":                       true,
    -+	"cmd/vet/testdata/deadcode":                       true,
    -+	"cmd/vet/testdata/httpresponse":                   true,
    -+	"cmd/vet/testdata/lostcancel":                     true,
    -+	"cmd/vet/testdata/method":                         true,
    -+	"cmd/vet/testdata/nilfunc":                        true,
    -+	"cmd/vet/testdata/print":                          true,
    -+	"cmd/vet/testdata/rangeloop":                      true,
    -+	"cmd/vet/testdata/shift":                          true,
    -+	"cmd/vet/testdata/structtag":                      true,
    -+	"cmd/vet/testdata/tagtest":                        true,
    -+	"cmd/vet/testdata/testingpkg":                     true,
    -+	"cmd/vet/testdata/unmarshal":                      true,
    -+	"cmd/vet/testdata/unsafeptr":                      true,
    -+	"cmd/vet/testdata/unused":                         true,
    -+	"compress/bzip2":                                  true,
    -+	"compress/bzip2/testdata":                         true,
    -+	"compress/flate":                                  true,
    -+	"compress/flate/testdata":                         true,
    -+	"compress/gzip":                                   true,
    -+	"compress/gzip/testdata":                          true,
    -+	"compress/lzw":                                    true,
    -+	"compress/testdata":                               true,
    -+	"compress/zlib":                                   true,
    -+	"container/heap":                                  true,
    -+	"container/list":                                  true,
    -+	"container/ring":                                  true,
    -+	"context":                                         true,
    -+	"crypto":                                          true,
    -+	"crypto/aes":                                      true,
    -+	"crypto/cipher":                                   true,
    -+	"crypto/des":                                      true,
    -+	"crypto/dsa":                                      true,
    -+	"crypto/ecdsa":                                    true,
    -+	"crypto/ecdsa/testdata":                           true,
    -+	"crypto/ed25519":                                  true,
    -+	"crypto/ed25519/internal/edwards25519":            true,
    -+	"crypto/ed25519/internal/edwards25519/field":      true,
    - 	"crypto/ed25519/internal/edwards25519/field/_asm": true,
    --	"crypto/ed25519/testdata": true,
    --	"crypto/elliptic": true,
    --	"crypto/elliptic/internal/fiat": true,
    --	"crypto/hmac": true,
    --	"crypto/internal/randutil": true,
    --	"crypto/internal/subtle": true,
    --	"crypto/md5": true,
    --	"crypto/rand": true,
    --	"crypto/rc4": true,
    --	"crypto/rsa": true,
    --	"crypto/rsa/testdata": true,
    --	"crypto/sha1": true,
    --	"crypto/sha256": true,
    --	"crypto/sha512": true,
    --	"crypto/subtle": true,
    --	"crypto/tls": true,
    --	"crypto/tls/testdata": true,
    --	"crypto/x509": true,
    --	"crypto/x509/internal/macos": true,
    --	"crypto/x509/pkix": true,
    --	"crypto/x509/testdata": true,
    --	"database/sql": true,
    --	"database/sql/driver": true,
    --	"debug/dwarf": true,
    --	"debug/dwarf/testdata": true,
    --	"debug/elf": true,
    --	"debug/elf/testdata": true,
    --	"debug/gosym": true,
    --	"debug/gosym/testdata": true,
    --	"debug/macho": true,
    --	"debug/macho/testdata": true,
    --	"debug/pe": true,
    --	"debug/pe/testdata": true,
    --	"debug/plan9obj": true,
    --	"debug/plan9obj/testdata": true,
    --	"embed": true,
    --	"embed/internal/embedtest": true,
    --	"embed/internal/embedtest/testdata": true,
    --	"embed/internal/embedtest/testdata/-not-hidden": true,
    --	"embed/internal/embedtest/testdata/.hidden": true,
    -+	"crypto/ed25519/testdata":                         true,
    -+	"crypto/elliptic":                                 true,
    -+	"crypto/elliptic/internal/fiat":                   true,
    -+	"crypto/hmac":                                     true,
    -+	"crypto/internal/randutil":                        true,
    -+	"crypto/internal/subtle":                          true,
    -+	"crypto/md5":                                      true,
    -+	"crypto/rand":                                     true,
    -+	"crypto/rc4":                                      true,
    -+	"crypto/rsa":                                      true,
    -+	"crypto/rsa/testdata":                             true,
    -+	"crypto/sha1":                                     true,
    -+	"crypto/sha256":                                   true,
    -+	"crypto/sha512":                                   true,
    -+	"crypto/subtle":                                   true,
    -+	"crypto/tls":                                      true,
    -+	"crypto/tls/testdata":                             true,
    -+	"crypto/x509":                                     true,
    -+	"crypto/x509/internal/macos":                      true,
    -+	"crypto/x509/pkix":                                true,
    -+	"crypto/x509/testdata":                            true,
    -+	"database/sql":                                    true,
    -+	"database/sql/driver":                             true,
    -+	"debug/dwarf":                                     true,
    -+	"debug/dwarf/testdata":                            true,
    -+	"debug/elf":                                       true,
    -+	"debug/elf/testdata":                              true,
    -+	"debug/gosym":                                     true,
    -+	"debug/gosym/testdata":                            true,
    -+	"debug/macho":                                     true,
    -+	"debug/macho/testdata":                            true,
    -+	"debug/pe":                                        true,
    -+	"debug/pe/testdata":                               true,
    -+	"debug/plan9obj":                                  true,
    -+	"debug/plan9obj/testdata":                         true,
    -+	"embed":                                           true,
    -+	"embed/internal/embedtest":                        true,
    -+	"embed/internal/embedtest/testdata":               true,
    -+	"embed/internal/embedtest/testdata/-not-hidden":   true,
    -+	"embed/internal/embedtest/testdata/.hidden":       true,
    - 	"embed/internal/embedtest/testdata/.hidden/.more": true,
    - 	"embed/internal/embedtest/testdata/.hidden/_more": true,
    --	"embed/internal/embedtest/testdata/.hidden/more": true,
    --	"embed/internal/embedtest/testdata/_hidden": true,
    --	"embed/internal/embedtest/testdata/i": true,
    --	"embed/internal/embedtest/testdata/i/j/k": true,
    --	"encoding": true,
    --	"encoding/ascii85": true,
    --	"encoding/asn1": true,
    --	"encoding/base32": true,
    --	"encoding/base64": true,
    --	"encoding/binary": true,
    --	"encoding/csv": true,
    --	"encoding/gob": true,
    --	"encoding/hex": true,
    --	"encoding/json": true,
    --	"encoding/json/testdata": true,
    --	"encoding/pem": true,
    --	"encoding/xml": true,
    --	"errors": true,
    --	"expvar": true,
    --	"flag": true,
    --	"fmt": true,
    --	"go/ast": true,
    --	"go/build": true,
    --	"go/build/constraint": true,
    --	"go/build/testdata/cgo_disabled": true,
    --	"go/build/testdata/doc": true,
    --	"go/build/testdata/empty": true,
    --	"go/build/testdata/multi": true,
    --	"go/build/testdata/other": true,
    --	"go/build/testdata/other/file": true,
    -+	"embed/internal/embedtest/testdata/.hidden/more":  true,
    -+	"embed/internal/embedtest/testdata/_hidden":       true,
    -+	"embed/internal/embedtest/testdata/i":             true,
    -+	"embed/internal/embedtest/testdata/i/j/k":         true,
    -+	"encoding":                             true,
    -+	"encoding/ascii85":                     true,
    -+	"encoding/asn1":                        true,
    -+	"encoding/base32":                      true,
    -+	"encoding/base64":                      true,
    -+	"encoding/binary":                      true,
    -+	"encoding/csv":                         true,
    -+	"encoding/gob":                         true,
    -+	"encoding/hex":                         true,
    -+	"encoding/json":                        true,
    -+	"encoding/json/testdata":               true,
    -+	"encoding/pem":                         true,
    -+	"encoding/xml":                         true,
    -+	"errors":                               true,
    -+	"expvar":                               true,
    -+	"flag":                                 true,
    -+	"fmt":                                  true,
    -+	"go/ast":                               true,
    -+	"go/build":                             true,
    -+	"go/build/constraint":                  true,
    -+	"go/build/testdata/cgo_disabled":       true,
    -+	"go/build/testdata/doc":                true,
    -+	"go/build/testdata/empty":              true,
    -+	"go/build/testdata/multi":              true,
    -+	"go/build/testdata/other":              true,
    -+	"go/build/testdata/other/file":         true,
    - 	"go/build/testdata/withvendor/src/a/b": true,
    - 	"go/build/testdata/withvendor/src/a/vendor/c/d": true,
    --	"go/constant": true,
    --	"go/doc": true,
    --	"go/doc/testdata": true,
    --	"go/format": true,
    --	"go/importer": true,
    --	"go/internal/gccgoimporter": true,
    --	"go/internal/gccgoimporter/testdata": true,
    --	"go/internal/gcimporter": true,
    --	"go/internal/gcimporter/testdata": true,
    --	"go/internal/gcimporter/testdata/versions": true,
    --	"go/internal/srcimporter": true,
    -+	"go/constant":                                 true,
    -+	"go/doc":                                      true,
    -+	"go/doc/testdata":                             true,
    -+	"go/format":                                   true,
    -+	"go/importer":                                 true,
    -+	"go/internal/gccgoimporter":                   true,
    -+	"go/internal/gccgoimporter/testdata":          true,
    -+	"go/internal/gcimporter":                      true,
    -+	"go/internal/gcimporter/testdata":             true,
    -+	"go/internal/gcimporter/testdata/versions":    true,
    -+	"go/internal/srcimporter":                     true,
    - 	"go/internal/srcimporter/testdata/issue20855": true,
    - 	"go/internal/srcimporter/testdata/issue23092": true,
    - 	"go/internal/srcimporter/testdata/issue24392": true,
    --	"go/internal/typeparams": true,
    --	"go/parser": true,
    --	"go/parser/testdata": true,
    -+	"go/internal/typeparams":                      true,
    -+	"go/parser":                                   true,
    -+	"go/parser/testdata":                          true,
    - 	"go/parser/testdata/issue42951/not_a_file.go": true,
    --	"go/parser/testdata/resolution": true,
    --	"go/printer": true,
    --	"go/printer/testdata": true,
    --	"go/scanner": true,
    --	"go/token": true,
    --	"go/types": true,
    --	"go/types/testdata/check": true,
    --	"go/types/testdata/check/decls2": true,
    --	"go/types/testdata/check/importdecl0": true,
    --	"go/types/testdata/check/importdecl1": true,
    --	"go/types/testdata/check/issue25008": true,
    --	"go/types/testdata/examples": true,
    --	"go/types/testdata/fixedbugs": true,
    --	"hash": true,
    --	"hash/adler32": true,
    --	"hash/crc32": true,
    --	"hash/crc64": true,
    --	"hash/fnv": true,
    --	"hash/maphash": true,
    --	"html": true,
    --	"html/template": true,
    --	"html/template/testdata": true,
    --	"image": true,
    --	"image/color": true,
    --	"image/color/palette": true,
    --	"image/draw": true,
    --	"image/gif": true,
    --	"image/internal/imageutil": true,
    --	"image/jpeg": true,
    --	"image/png": true,
    --	"image/png/testdata": true,
    --	"image/png/testdata/pngsuite": true,
    --	"image/testdata": true,
    --	"index/suffixarray": true,
    --	"internal/abi": true,
    --	"internal/abi/testdata": true,
    --	"internal/buildcfg": true,
    --	"internal/bytealg": true,
    --	"internal/cfg": true,
    --	"internal/cpu": true,
    --	"internal/execabs": true,
    --	"internal/fmtsort": true,
    --	"internal/goexperiment": true,
    --	"internal/goroot": true,
    --	"internal/goversion": true,
    --	"internal/itoa": true,
    --	"internal/lazyregexp": true,
    --	"internal/lazytemplate": true,
    --	"internal/nettrace": true,
    --	"internal/obscuretestdata": true,
    --	"internal/oserror": true,
    --	"internal/poll": true,
    --	"internal/profile": true,
    --	"internal/race": true,
    --	"internal/reflectlite": true,
    --	"internal/singleflight": true,
    --	"internal/syscall/execenv": true,
    --	"internal/syscall/unix": true,
    --	"internal/syscall/windows": true,
    --	"internal/syscall/windows/registry": true,
    --	"internal/syscall/windows/sysdll": true,
    --	"internal/sysinfo": true,
    --	"internal/testenv": true,
    --	"internal/testlog": true,
    --	"internal/trace": true,
    --	"internal/trace/testdata": true,
    --	"internal/unsafeheader": true,
    --	"internal/xcoff": true,
    --	"internal/xcoff/testdata": true,
    --	"io": true,
    --	"io/fs": true,
    --	"io/ioutil": true,
    --	"io/ioutil/testdata": true,
    --	"log": true,
    --	"log/syslog": true,
    --	"math": true,
    --	"math/big": true,
    --	"math/bits": true,
    --	"math/cmplx": true,
    --	"math/rand": true,
    --	"mime": true,
    --	"mime/multipart": true,
    --	"mime/multipart/testdata": true,
    --	"mime/quotedprintable": true,
    --	"mime/testdata": true,
    --	"net": true,
    --	"net/http": true,
    --	"net/http/cgi": true,
    --	"net/http/cgi/testdata": true,
    --	"net/http/cookiejar": true,
    --	"net/http/fcgi": true,
    --	"net/http/httptest": true,
    --	"net/http/httptrace": true,
    --	"net/http/httputil": true,
    --	"net/http/internal": true,
    --	"net/http/internal/ascii": true,
    --	"net/http/internal/testcert": true,
    --	"net/http/pprof": true,
    --	"net/http/testdata": true,
    --	"net/internal/socktest": true,
    --	"net/mail": true,
    --	"net/rpc": true,
    --	"net/rpc/jsonrpc": true,
    --	"net/smtp": true,
    --	"net/testdata": true,
    --	"net/textproto": true,
    --	"net/url": true,
    --	"os": true,
    --	"os/exec": true,
    --	"os/signal": true,
    --	"os/signal/internal/pty": true,
    --	"os/testdata": true,
    --	"os/testdata/dirfs": true,
    --	"os/testdata/dirfs/dir": true,
    --	"os/testdata/issue37161": true,
    --	"os/user": true,
    --	"path": true,
    --	"path/filepath": true,
    --	"plugin": true,
    --	"reflect": true,
    --	"reflect/internal/example1": true,
    --	"reflect/internal/example2": true,
    --	"regexp": true,
    --	"regexp/syntax": true,
    --	"regexp/testdata": true,
    --	"runtime": true,
    --	"runtime/cgo": true,
    --	"runtime/debug": true,
    --	"runtime/internal/atomic": true,
    --	"runtime/internal/math": true,
    --	"runtime/internal/sys": true,
    --	"runtime/metrics": true,
    --	"runtime/msan": true,
    --	"runtime/pprof": true,
    --	"runtime/pprof/testdata": true,
    --	"runtime/pprof/testdata/mappingtest": true,
    --	"runtime/race": true,
    --	"runtime/race/testdata": true,
    --	"runtime/testdata/testfaketime": true,
    --	"runtime/testdata/testprog": true,
    --	"runtime/testdata/testprogcgo": true,
    --	"runtime/testdata/testprogcgo/windows": true,
    --	"runtime/testdata/testprognet": true,
    --	"runtime/testdata/testwinlib": true,
    --	"runtime/testdata/testwinlibsignal": true,
    --	"runtime/testdata/testwinsignal": true,
    --	"runtime/trace": true,
    --	"sort": true,
    --	"strconv": true,
    --	"strconv/testdata": true,
    --	"strings": true,
    --	"sync": true,
    --	"sync/atomic": true,
    --	"syscall": true,
    --	"syscall/js": true,
    --	"testdata": true,
    --	"testing": true,
    --	"testing/fstest": true,
    --	"testing/internal/testdeps": true,
    --	"testing/iotest": true,
    --	"testing/quick": true,
    --	"text/scanner": true,
    --	"text/tabwriter": true,
    --	"text/template": true,
    --	"text/template/parse": true,
    --	"text/template/testdata": true,
    --	"time": true,
    --	"time/testdata": true,
    --	"time/tzdata": true,
    --	"unicode": true,
    --	"unicode/utf16": true,
    --	"unicode/utf8": true,
    --	"unsafe": true,
    --	"vendor": true,
    --	"vendor/golang.org/x/crypto": true,
    --	"vendor/golang.org/x/crypto/chacha20": true,
    -+	"go/parser/testdata/resolution":               true,
    -+	"go/printer":                                  true,
    -+	"go/printer/testdata":                         true,
    -+	"go/scanner":                                  true,
    -+	"go/token":                                    true,
    -+	"go/types":                                    true,
    -+	"go/types/testdata/check":                     true,
    -+	"go/types/testdata/check/decls2":              true,
    -+	"go/types/testdata/check/importdecl0":         true,
    -+	"go/types/testdata/check/importdecl1":         true,
    -+	"go/types/testdata/check/issue25008":          true,
    -+	"go/types/testdata/examples":                  true,
    -+	"go/types/testdata/fixedbugs":                 true,
    -+	"hash":                                        true,
    -+	"hash/adler32":                                true,
    -+	"hash/crc32":                                  true,
    -+	"hash/crc64":                                  true,
    -+	"hash/fnv":                                    true,
    -+	"hash/maphash":                                true,
    -+	"html":                                        true,
    -+	"html/template":                               true,
    -+	"html/template/testdata":                      true,
    -+	"image":                                       true,
    -+	"image/color":                                 true,
    -+	"image/color/palette":                         true,
    -+	"image/draw":                                  true,
    -+	"image/gif":                                   true,
    -+	"image/internal/imageutil":                    true,
    -+	"image/jpeg":                                  true,
    -+	"image/png":                                   true,
    -+	"image/png/testdata":                          true,
    -+	"image/png/testdata/pngsuite":                 true,
    -+	"image/testdata":                              true,
    -+	"index/suffixarray":                           true,
    -+	"internal/abi":                                true,
    -+	"internal/abi/testdata":                       true,
    -+	"internal/buildcfg":                           true,
    -+	"internal/bytealg":                            true,
    -+	"internal/cfg":                                true,
    -+	"internal/cpu":                                true,
    -+	"internal/execabs":                            true,
    -+	"internal/fmtsort":                            true,
    -+	"internal/goexperiment":                       true,
    -+	"internal/goroot":                             true,
    -+	"internal/goversion":                          true,
    -+	"internal/itoa":                               true,
    -+	"internal/lazyregexp":                         true,
    -+	"internal/lazytemplate":                       true,
    -+	"internal/nettrace":                           true,
    -+	"internal/obscuretestdata":                    true,
    -+	"internal/oserror":                            true,
    -+	"internal/poll":                               true,
    -+	"internal/profile":                            true,
    -+	"internal/race":                               true,
    -+	"internal/reflectlite":                        true,
    -+	"internal/singleflight":                       true,
    -+	"internal/syscall/execenv":                    true,
    -+	"internal/syscall/unix":                       true,
    -+	"internal/syscall/windows":                    true,
    -+	"internal/syscall/windows/registry":           true,
    -+	"internal/syscall/windows/sysdll":             true,
    -+	"internal/sysinfo":                            true,
    -+	"internal/testenv":                            true,
    -+	"internal/testlog":                            true,
    -+	"internal/trace":                              true,
    -+	"internal/trace/testdata":                     true,
    -+	"internal/unsafeheader":                       true,
    -+	"internal/xcoff":                              true,
    -+	"internal/xcoff/testdata":                     true,
    -+	"io":                                          true,
    -+	"io/fs":                                       true,
    -+	"io/ioutil":                                   true,
    -+	"io/ioutil/testdata":                          true,
    -+	"log":                                         true,
    -+	"log/syslog":                                  true,
    -+	"math":                                        true,
    -+	"math/big":                                    true,
    -+	"math/bits":                                   true,
    -+	"math/cmplx":                                  true,
    -+	"math/rand":                                   true,
    -+	"mime":                                        true,
    -+	"mime/multipart":                              true,
    -+	"mime/multipart/testdata":                     true,
    -+	"mime/quotedprintable":                        true,
    -+	"mime/testdata":                               true,
    -+	"net":                                         true,
    -+	"net/http":                                    true,
    -+	"net/http/cgi":                                true,
    -+	"net/http/cgi/testdata":                       true,
    -+	"net/http/cookiejar":                          true,
    -+	"net/http/fcgi":                               true,
    -+	"net/http/httptest":                           true,
    -+	"net/http/httptrace":                          true,
    -+	"net/http/httputil":                           true,
    -+	"net/http/internal":                           true,
    -+	"net/http/internal/ascii":                     true,
    -+	"net/http/internal/testcert":                  true,
    -+	"net/http/pprof":                              true,
    -+	"net/http/testdata":                           true,
    -+	"net/internal/socktest":                       true,
    -+	"net/mail":                                    true,
    -+	"net/rpc":                                     true,
    -+	"net/rpc/jsonrpc":                             true,
    -+	"net/smtp":                                    true,
    -+	"net/testdata":                                true,
    -+	"net/textproto":                               true,
    -+	"net/url":                                     true,
    -+	"os":                                          true,
    -+	"os/exec":                                     true,
    -+	"os/signal":                                   true,
    -+	"os/signal/internal/pty":                      true,
    -+	"os/testdata":                                 true,
    -+	"os/testdata/dirfs":                           true,
    -+	"os/testdata/dirfs/dir":                       true,
    -+	"os/testdata/issue37161":                      true,
    -+	"os/user":                                     true,
    -+	"path":                                        true,
    -+	"path/filepath":                               true,
    -+	"plugin":                                      true,
    -+	"reflect":                                     true,
    -+	"reflect/internal/example1":                   true,
    -+	"reflect/internal/example2":                   true,
    -+	"regexp":                                      true,
    -+	"regexp/syntax":                               true,
    -+	"regexp/testdata":                             true,
    -+	"runtime":                                     true,
    -+	"runtime/cgo":                                 true,
    -+	"runtime/debug":                               true,
    -+	"runtime/internal/atomic":                     true,
    -+	"runtime/internal/math":                       true,
    -+	"runtime/internal/sys":                        true,
    -+	"runtime/metrics":                             true,
    -+	"runtime/msan":                                true,
    -+	"runtime/pprof":                               true,
    -+	"runtime/pprof/testdata":                      true,
    -+	"runtime/pprof/testdata/mappingtest":          true,
    -+	"runtime/race":                                true,
    -+	"runtime/race/testdata":                       true,
    -+	"runtime/testdata/testfaketime":               true,
    -+	"runtime/testdata/testprog":                   true,
    -+	"runtime/testdata/testprogcgo":                true,
    -+	"runtime/testdata/testprogcgo/windows":        true,
    -+	"runtime/testdata/testprognet":                true,
    -+	"runtime/testdata/testwinlib":                 true,
    -+	"runtime/testdata/testwinlibsignal":           true,
    -+	"runtime/testdata/testwinsignal":              true,
    -+	"runtime/trace":                               true,
    -+	"sort":                                        true,
    -+	"strconv":                                     true,
    -+	"strconv/testdata":                            true,
    -+	"strings":                                     true,
    -+	"sync":                                        true,
    -+	"sync/atomic":                                 true,
    -+	"syscall":                                     true,
    -+	"syscall/js":                                  true,
    -+	"testdata":                                    true,
    -+	"testing":                                     true,
    -+	"testing/fstest":                              true,
    -+	"testing/internal/testdeps":                   true,
    -+	"testing/iotest":                              true,
    -+	"testing/quick":                               true,
    -+	"text/scanner":                                true,
    -+	"text/tabwriter":                              true,
    -+	"text/template":                               true,
    -+	"text/template/parse":                         true,
    -+	"text/template/testdata":                      true,
    -+	"time":                                        true,
    -+	"time/testdata":                               true,
    -+	"time/tzdata":                                 true,
    -+	"unicode":                                     true,
    -+	"unicode/utf16":                               true,
    -+	"unicode/utf8":                                true,
    -+	"unsafe":                                      true,
    -+	"vendor":                                      true,
    -+	"vendor/golang.org/x/crypto":                  true,
    -+	"vendor/golang.org/x/crypto/chacha20":         true,
    - 	"vendor/golang.org/x/crypto/chacha20poly1305": true,
    --	"vendor/golang.org/x/crypto/cryptobyte": true,
    --	"vendor/golang.org/x/crypto/cryptobyte/asn1": true,
    --	"vendor/golang.org/x/crypto/curve25519": true,
    --	"vendor/golang.org/x/crypto/hkdf": true,
    --	"vendor/golang.org/x/crypto/internal/subtle": true,
    --	"vendor/golang.org/x/crypto/poly1305": true,
    --	"vendor/golang.org/x/net": true,
    --	"vendor/golang.org/x/net/dns/dnsmessage": true,
    --	"vendor/golang.org/x/net/http/httpguts": true,
    --	"vendor/golang.org/x/net/http/httpproxy": true,
    --	"vendor/golang.org/x/net/http2/hpack": true,
    --	"vendor/golang.org/x/net/idna": true,
    --	"vendor/golang.org/x/net/lif": true,
    --	"vendor/golang.org/x/net/nettest": true,
    --	"vendor/golang.org/x/net/route": true,
    --	"vendor/golang.org/x/sys": true,
    --	"vendor/golang.org/x/sys/cpu": true,
    --	"vendor/golang.org/x/text": true,
    --	"vendor/golang.org/x/text/secure/bidirule": true,
    --	"vendor/golang.org/x/text/transform": true,
    --	"vendor/golang.org/x/text/unicode/bidi": true,
    --	"vendor/golang.org/x/text/unicode/norm": true,
    -+	"vendor/golang.org/x/crypto/cryptobyte":       true,
    -+	"vendor/golang.org/x/crypto/cryptobyte/asn1":  true,
    -+	"vendor/golang.org/x/crypto/curve25519":       true,
    -+	"vendor/golang.org/x/crypto/hkdf":             true,
    -+	"vendor/golang.org/x/crypto/internal/subtle":  true,
    -+	"vendor/golang.org/x/crypto/poly1305":         true,
    -+	"vendor/golang.org/x/net":                     true,
    -+	"vendor/golang.org/x/net/dns/dnsmessage":      true,
    -+	"vendor/golang.org/x/net/http/httpguts":       true,
    -+	"vendor/golang.org/x/net/http/httpproxy":      true,
    -+	"vendor/golang.org/x/net/http2/hpack":         true,
    -+	"vendor/golang.org/x/net/idna":                true,
    -+	"vendor/golang.org/x/net/lif":                 true,
    -+	"vendor/golang.org/x/net/nettest":             true,
    -+	"vendor/golang.org/x/net/route":               true,
    -+	"vendor/golang.org/x/sys":                     true,
    -+	"vendor/golang.org/x/sys/cpu":                 true,
    -+	"vendor/golang.org/x/text":                    true,
    -+	"vendor/golang.org/x/text/secure/bidirule":    true,
    -+	"vendor/golang.org/x/text/transform":          true,
    -+	"vendor/golang.org/x/text/unicode/bidi":       true,
    -+	"vendor/golang.org/x/text/unicode/norm":       true,
    - }
    +@@ language/go/resolve_test.go: func TestResolveExternal(t *testing.T) {
    + 				Name:     "custom_repo",
    + 				GoPrefix: "example.com/repo",
    + 			}},
    +-			depMode:    staticMode,
    +-			want:       "@custom_repo//v2/foo:go_default_library",
    ++			depMode: staticMode,
    ++			want:    "@custom_repo//v2/foo:go_default_library",
    + 		}, {
    + 			desc:       "static_mode_unknown",
    + 			importpath: "example.com/repo/v2/foo",
    + 			depMode:    staticMode,
    + 			want:       "",
    +-		}, 
    ++		},
    + 	} {
    + 		t.Run(tc.desc, func(t *testing.T) {
    + 			gc.depMode = tc.depMode
     
      ## language/go/testdata/cgolib_with_build_tags/pure_linux.go ##
     @@
4:  8c7397f ! 4:  97db9bd fix U1000
    @@ language/go/resolve.go: func resolveWithIndexGo(c *config.Config, ix *resolve.Ru
      
     -var modMajorRex = regexp.MustCompile(`/v\d+(?:/|$)`)
     -
    - func resolveExternal(c *config.Config, rc *repo.RemoteCache, imp string) (label.Label, error) {
    - 	// If we're in module mode, use "go list" to find the module path and
    - 	// repository name. Otherwise, use special cases (for github.com, golang.org)
    + func resolveToExternalLabel(c *config.Config, resolveFn func(string) (string, string, error), imp string) (label.Label, error) {
    + 	prefix, repo, err := resolveFn(imp)
    + 	if err != nil {
    + 		return label.NoLabel, err
    + 	} else if prefix == "" && repo == "" {
    +-		return label.NoLabel, skipImportError
    ++		return label.NoLabel, errSkipImport
    + 	}
    + 
    + 	var pkg string
     
      ## repo/remote.go ##
     @@ repo/remote.go: type modValue struct {
5:  d1d1d03 = 5:  a49d29c fix S1011, S1017, SA9003, S1007, SA4009
6:  0757105 = 6:  e77c613 remove deadcode constants
7:  09f494a ! 7:  e6c55b7 fix errcheck
    @@ cmd/gazelle/fix_test.go: func TestCreateFile(t *testing.T) {
      
      	// Check that Gazelle creates a new file named "BUILD.bazel".
     -	run(dir, defaultArgs(dir))
    -+	err = run(dir, defaultArgs(dir))
    -+	if err != nil {
    ++	if err = run(dir, defaultArgs(dir)); err != nil {
     +		t.Fatalf("run failed: %v", err)
     +	}
      
    @@ cmd/gazelle/fix_test.go: func TestUpdateFile(t *testing.T) {
      
      	// Check that Gazelle updates the BUILD file in place.
     -	run(dir, defaultArgs(dir))
    -+	err = run(dir, defaultArgs(dir))
    -+	if err != nil {
    ++	if err = run(dir, defaultArgs(dir)); err != nil {
     +		t.Fatalf("run failed: %v", err)
     +	}
     +
    @@ cmd/gazelle/fix_test.go: go_binary(
      
      	// Ensure that Gazelle does not write to the BUILD file.
     -	run(dir, defaultArgs(dir))
    -+	err = run(dir, defaultArgs(dir))
    -+	if err != nil {
    ++	if err = run(dir, defaultArgs(dir)); err != nil {
     +		t.Fatalf("run failed: %v", err)
     +	}
     +
    @@ cmd/gazelle/fix_test.go: go_library(
      
      	// Check that Gazelle does not update the BUILD file, due to lang filter.
     -	run(dir, []string{
    -+	err := run(dir, []string{
    ++	if err := run(dir, []string{
      		"-repo_root", dir,
      		"-go_prefix", "example.com/repo",
      		"-lang=proto",
      		dir,
    - 	})
    -+	if err != nil {
    +-	})
    ++	}); err != nil {
     +		t.Fatalf("run failed: %v", err)
     +	}
      
    @@ language/go/config.go: Update io_bazel_rules_go to a newer version in your WORKS
      				}
      				gc.preprocessTags()
     -				gc.setBuildTags(d.Value)
    -+				err := gc.setBuildTags(d.Value)
    -+				if err != nil {
    ++				if err := gc.setBuildTags(d.Value); err != nil {
     +					log.Print(err)
     +				}
      
    @@ language/go/generate.go: func emptyPackage(c *config.Config, dir, rel string, f
      		rel:  rel,
      	}
     -	pkg.inferImportPath(c)
    -+	err := pkg.inferImportPath(c)
    -+	if err != nil {
    ++	if err := pkg.inferImportPath(c); err != nil {
     +		log.Printf("could not infer import path: %v", err)
     +	}
     +
    @@ language/proto/gen/gen_known_imports.go: func run(args []string) (err error) {
      	fs.IntVar(&keyColumn, "key", 0, "key column number")
      	fs.IntVar(&valueColumn, "value", 1, "value column number")
     -	fs.Parse(args)
    -+	err = fs.Parse(args)
    -+	if err != nil {
    ++	if err = fs.Parse(args); err != nil {
     +		return fmt.Errorf("invalid flag: %v", err)
     +	}
      	if protoCsvPath == "" {
    @@ testtools/files.go: func TestGazelleGenerationOnPath(t *testing.T, args *TestGaz
      
      		config := &testConfig{}
     -		filepath.WalkDir(args.TestDataPathAbsolute, func(path string, d fs.DirEntry, err error) error {
    -+		err := filepath.WalkDir(args.TestDataPathAbsolute, func(path string, d fs.DirEntry, err error) error {
    ++		f := func(path string, d fs.DirEntry, err error) error {
      			if err != nil {
      				t.Fatalf("File walk error on path %q. Error: %v", path, err)
      			}
     @@ testtools/files.go: func TestGazelleGenerationOnPath(t *testing.T, args *TestGazelleGenerationArgs)
    + 				})
      			}
      			return nil
    - 		})
    -+		if err != nil {
    +-		})
    ++		}
    ++		if err := filepath.WalkDir(args.TestDataPathAbsolute, f); err != nil {
     +			t.Fatal(err)
     +		}
      
      		testdataDir, cleanup := CreateFiles(t, inputs)
    - 
    + 		workspaceRoot := filepath.Join(testdataDir, args.Name)
     @@ testtools/files.go: func TestGazelleGenerationOnPath(t *testing.T, args *TestGazelleGenerationArgs)
    - 					updateExpectedConfig(t, config.Stderr, stdout.String(), srcTestDirectory, expectedStderrFilename)
    + 					updateExpectedConfig(t, config.Stderr, redactWorkspacePath(stderr.String(), workspaceRoot), srcTestDirectory, expectedStderrFilename)
      					updateExpectedConfig(t, fmt.Sprintf("%d", config.ExitCode), fmt.Sprintf("%d", actualExitCode), srcTestDirectory, expectedExitCodeFilename)
      
     -					filepath.Walk(testdataDir, func(walkedPath string, info os.FileInfo, err error) error {

@sluongng
Copy link
Contributor Author

Pushed another update to move a hunk from commit 4 fix U1000 to commit 2 fix ST1012

1:  4af3356 = 1:  4af3356 Fix staticcheck ST1006
2:  3dfdb7a ! 2:  06a429d fix ST1012
    @@ language/go/resolve.go: func resolveWithIndexGo(c *config.Config, ix *resolve.Ru
        }
        return bestMatch.Label, nil
      }
    +@@ language/go/resolve.go: func resolveToExternalLabel(c *config.Config, resolveFn func(string) (string, st
    +   if err != nil {
    +           return label.NoLabel, err
    +   } else if prefix == "" && repo == "" {
    +-          return label.NoLabel, skipImportError
    ++          return label.NoLabel, errSkipImport
    +   }
    +
    +   var pkg string
     @@ language/go/resolve.go: func resolveVendored(gc *goConfig, imp string) (label.Label, error) {

      func resolveProto(c *config.Config, ix *resolve.RuleIndex, rc *repo.RemoteCache, imp string, from label.Label) (label.Label, error) {
3:  324ea7e = 3:  d577b7a apply gofumpt
4:  97db9bd ! 4:  d16254b fix U1000
    @@ language/go/resolve.go: func resolveWithIndexGo(c *config.Config, ix *resolve.Ru
      func resolveToExternalLabel(c *config.Config, resolveFn func(string) (string, string, error), imp string) (label.Label, error) {
        prefix, repo, err := resolveFn(imp)
        if err != nil {
    -           return label.NoLabel, err
    -   } else if prefix == "" && repo == "" {
    --          return label.NoLabel, skipImportError
    -+          return label.NoLabel, errSkipImport
    -   }
    -
    -   var pkg string

      ## repo/remote.go ##
     @@ repo/remote.go: type modValue struct {
5:  a49d29c = 5:  a1c5267 fix S1011, S1017, SA9003, S1007, SA4009
6:  e77c613 = 6:  965c8fa remove deadcode constants
7:  e6c55b7 = 7:  d39071e fix errcheck

Without this, commit 2 would have be broken

linzhp
linzhp approved these changes Apr 11, 2022
View reviewed changes
Copy link
Contributor

@linzhp linzhp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can also consider setting up nogo linters, so no new violations of these checks will be introduced.

@linzhp linzhp merged commit ec1c643 into bazel-contrib:master Apr 11, 2022
@linzhp linzhp mentioned this pull request Jun 18, 2022
Merged
gcf-merge-on-green bot referenced this pull request in googleapis/gapic-config-validator Jun 27, 2022
@renovate-bot
chore(deps): update dependency bazel_gazelle to v0.26.0 (#249)
d77461b 
[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [bazel_gazelle](https://togithub.com/bazelbuild/bazel-gazelle) | http_archive | minor | `v0.25.0` -> `v0.26.0` |

---

### Release Notes

<details>
<summary>bazelbuild/bazel-gazelle</summary>

### [`v0.26.0`](https://togithub.com/bazelbuild/bazel-gazelle/releases/tag/v0.26.0)

[Compare Source](https://togithub.com/bazelbuild/bazel-gazelle/compare/v0.25.0...v0.26.0)

#### What's Changed

-   fix(tests): fix gazelle_generation_test expected stderr update by [@&#8203;jbedard](https://togithub.com/jbedard) in [https://github.com/bazelbuild/bazel-gazelle/pull/1220](https://togithub.com/bazelbuild/bazel-gazelle/pull/1220)
-   Add an e2e test confirming no output on success by [@&#8203;achew22](https://togithub.com/achew22) in [https://github.com/bazelbuild/bazel-gazelle/pull/1216](https://togithub.com/bazelbuild/bazel-gazelle/pull/1216)
-   Update extend.md with a practical languages example by [@&#8203;Anthony-Bible](https://togithub.com/Anthony-Bible) in [https://github.com/bazelbuild/bazel-gazelle/pull/1222](https://togithub.com/bazelbuild/bazel-gazelle/pull/1222)
-   fix: Remove gazelle_binary import collision by [@&#8203;illicitonion](https://togithub.com/illicitonion) in [https://github.com/bazelbuild/bazel-gazelle/pull/1226](https://togithub.com/bazelbuild/bazel-gazelle/pull/1226)
-   Broaden label name regex by [@&#8203;illicitonion](https://togithub.com/illicitonion) in [https://github.com/bazelbuild/bazel-gazelle/pull/1229](https://togithub.com/bazelbuild/bazel-gazelle/pull/1229)
-   gazelle_generation_test: redact workspace path from output by [@&#8203;dr-dime](https://togithub.com/dr-dime) in [https://github.com/bazelbuild/bazel-gazelle/pull/1231](https://togithub.com/bazelbuild/bazel-gazelle/pull/1231)
-   Add -print0 to print names of rewritten files by [@&#8203;dr-dime](https://togithub.com/dr-dime) in [https://github.com/bazelbuild/bazel-gazelle/pull/1213](https://togithub.com/bazelbuild/bazel-gazelle/pull/1213)
-   Code Quality Improvements by [@&#8203;sluongng](https://togithub.com/sluongng) in [https://github.com/bazelbuild/bazel-gazelle/pull/1197](https://togithub.com/bazelbuild/bazel-gazelle/pull/1197)
-   Add -strict to exit on build file and directive errors by [@&#8203;dr-dime](https://togithub.com/dr-dime) in [https://github.com/bazelbuild/bazel-gazelle/pull/1214](https://togithub.com/bazelbuild/bazel-gazelle/pull/1214)
-   fix(lang/proto): include imports from different targets by [@&#8203;nickgooding](https://togithub.com/nickgooding) in [https://github.com/bazelbuild/bazel-gazelle/pull/1237](https://togithub.com/bazelbuild/bazel-gazelle/pull/1237)
-   Update rules example in README to v0.25.0 by [@&#8203;yujunz](https://togithub.com/yujunz) in [https://github.com/bazelbuild/bazel-gazelle/pull/1240](https://togithub.com/bazelbuild/bazel-gazelle/pull/1240)
-   Allow static dependency resolution for Gazelle rule by [@&#8203;uhthomas](https://togithub.com/uhthomas) in [https://github.com/bazelbuild/bazel-gazelle/pull/1242](https://togithub.com/bazelbuild/bazel-gazelle/pull/1242)
-   Handle wrapped errors by [@&#8203;illicitonion](https://togithub.com/illicitonion) in [https://github.com/bazelbuild/bazel-gazelle/pull/1234](https://togithub.com/bazelbuild/bazel-gazelle/pull/1234)
-   Go: Update tests to use cmp.Diff instead of reflect.DeepEqual by [@&#8203;thempatel](https://togithub.com/thempatel) in [https://github.com/bazelbuild/bazel-gazelle/pull/1244](https://togithub.com/bazelbuild/bazel-gazelle/pull/1244)
-   Fix startup script manifest resolution with --nolegacy_external_runfiles by [@&#8203;jvolkman](https://togithub.com/jvolkman) in [https://github.com/bazelbuild/bazel-gazelle/pull/1247](https://togithub.com/bazelbuild/bazel-gazelle/pull/1247)
-   Label's package may contain [@&#8203;s](https://togithub.com/s) by [@&#8203;illicitonion](https://togithub.com/illicitonion) in [https://github.com/bazelbuild/bazel-gazelle/pull/1249](https://togithub.com/bazelbuild/bazel-gazelle/pull/1249)
-   Trim runfiles prefix consistently by [@&#8203;uhthomas](https://togithub.com/uhthomas) in [https://github.com/bazelbuild/bazel-gazelle/pull/1257](https://togithub.com/bazelbuild/bazel-gazelle/pull/1257)
-   Respect .bazelignore by [@&#8203;Whoaa512](https://togithub.com/Whoaa512) in [https://github.com/bazelbuild/bazel-gazelle/pull/1245](https://togithub.com/bazelbuild/bazel-gazelle/pull/1245)
-   Implement very minimalistic support for go workspaces by [@&#8203;HakanSunay](https://togithub.com/HakanSunay) in [https://github.com/bazelbuild/bazel-gazelle/pull/1250](https://togithub.com/bazelbuild/bazel-gazelle/pull/1250)
-   Fix typo in comment by [@&#8203;yujunz](https://togithub.com/yujunz) in [https://github.com/bazelbuild/bazel-gazelle/pull/1270](https://togithub.com/bazelbuild/bazel-gazelle/pull/1270)
-   Use `patch` from `@bazel_tools//tools/build_defs/repo:utils.bzl` by [@&#8203;bozaro](https://togithub.com/bozaro) in [https://github.com/bazelbuild/bazel-gazelle/pull/1269](https://togithub.com/bazelbuild/bazel-gazelle/pull/1269)
-   Update rules_go to 0.33.0 by [@&#8203;fmeum](https://togithub.com/fmeum) in [https://github.com/bazelbuild/bazel-gazelle/pull/1263](https://togithub.com/bazelbuild/bazel-gazelle/pull/1263)
-   Add support for auth_patterns in go_repository by [@&#8203;dmivankov](https://togithub.com/dmivankov) in [https://github.com/bazelbuild/bazel-gazelle/pull/1254](https://togithub.com/bazelbuild/bazel-gazelle/pull/1254)
-   Sluongng/revert patch by [@&#8203;sluongng](https://togithub.com/sluongng) in [https://github.com/bazelbuild/bazel-gazelle/pull/1277](https://togithub.com/bazelbuild/bazel-gazelle/pull/1277)
-   Stop inferring import path for empty packages by [@&#8203;linzhp](https://togithub.com/linzhp) in [https://github.com/bazelbuild/bazel-gazelle/pull/1280](https://togithub.com/bazelbuild/bazel-gazelle/pull/1280)
-   Don't exclude spaces from the label name regex by [@&#8203;illicitonion](https://togithub.com/illicitonion) in [https://github.com/bazelbuild/bazel-gazelle/pull/1271](https://togithub.com/bazelbuild/bazel-gazelle/pull/1271)

#### New Contributors

-   [@&#8203;Anthony-Bible](https://togithub.com/Anthony-Bible) made their first contribution in [https://github.com/bazelbuild/bazel-gazelle/pull/1222](https://togithub.com/bazelbuild/bazel-gazelle/pull/1222)
-   [@&#8203;dr-dime](https://togithub.com/dr-dime) made their first contribution in [https://github.com/bazelbuild/bazel-gazelle/pull/1231](https://togithub.com/bazelbuild/bazel-gazelle/pull/1231)
-   [@&#8203;sluongng](https://togithub.com/sluongng) made their first contribution in [https://github.com/bazelbuild/bazel-gazelle/pull/1197](https://togithub.com/bazelbuild/bazel-gazelle/pull/1197)
-   [@&#8203;nickgooding](https://togithub.com/nickgooding) made their first contribution in [https://github.com/bazelbuild/bazel-gazelle/pull/1237](https://togithub.com/bazelbuild/bazel-gazelle/pull/1237)
-   [@&#8203;yujunz](https://togithub.com/yujunz) made their first contribution in [https://github.com/bazelbuild/bazel-gazelle/pull/1240](https://togithub.com/bazelbuild/bazel-gazelle/pull/1240)
-   [@&#8203;uhthomas](https://togithub.com/uhthomas) made their first contribution in [https://github.com/bazelbuild/bazel-gazelle/pull/1242](https://togithub.com/bazelbuild/bazel-gazelle/pull/1242)
-   [@&#8203;thempatel](https://togithub.com/thempatel) made their first contribution in [https://github.com/bazelbuild/bazel-gazelle/pull/1244](https://togithub.com/bazelbuild/bazel-gazelle/pull/1244)
-   [@&#8203;Whoaa512](https://togithub.com/Whoaa512) made their first contribution in [https://github.com/bazelbuild/bazel-gazelle/pull/1245](https://togithub.com/bazelbuild/bazel-gazelle/pull/1245)
-   [@&#8203;HakanSunay](https://togithub.com/HakanSunay) made their first contribution in [https://github.com/bazelbuild/bazel-gazelle/pull/1250](https://togithub.com/bazelbuild/bazel-gazelle/pull/1250)
-   [@&#8203;bozaro](https://togithub.com/bozaro) made their first contribution in [https://github.com/bazelbuild/bazel-gazelle/pull/1269](https://togithub.com/bazelbuild/bazel-gazelle/pull/1269)
-   [@&#8203;fmeum](https://togithub.com/fmeum) made their first contribution in [https://github.com/bazelbuild/bazel-gazelle/pull/1263](https://togithub.com/bazelbuild/bazel-gazelle/pull/1263)
-   [@&#8203;dmivankov](https://togithub.com/dmivankov) made their first contribution in [https://github.com/bazelbuild/bazel-gazelle/pull/1254](https://togithub.com/bazelbuild/bazel-gazelle/pull/1254)

**Full Changelog**: bazel-contrib/bazel-gazelle@v0.25.0...v0.26.0

#### `WORKSPACE` code

    load("@&#8203;bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

    http_archive(
        name = "bazel_gazelle",
        sha256 = "501deb3d5695ab658e82f6f6f549ba681ea3ca2a5fb7911154b5aa45596183fa",
        urls = [
            "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.26.0/bazel-gazelle-v0.26.0.tar.gz",
            "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.26.0/bazel-gazelle-v0.26.0.tar.gz",
        ],
    )

    load("@&#8203;bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")

    ############################################################

### Define your own dependencies here using go_repository.

### Else, dependencies declared by rules_go/gazelle will be used.

### The first declaration of an external repository "wins".

    ############################################################

    gazelle_dependencies()

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox.

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-config-validator).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@linzhp linzhp linzhp approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sluongng @linzhp