cmd: remove redundant _

Change-Id: Ia7e1e3679e03d125feb9708cb05bbd32c4954edb
GitHub-Last-Rev: a62b72ea3edcf2b4f9f378cd03b1ac073ab80c74
GitHub-Pull-Request: golang/go#55957
Reviewed-on: https://go-review.googlesource.com/c/go/+/436879
Reviewed-by: Than McIntosh <thanm@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Run-TryBot: hopehook <hopehook@golangcn.org>
TryBot-Result: Gopher Robot <gobot@golang.org>

diff --git a/src/cmd/compile/internal/dwarfgen/dwarf.go b/src/cmd/compile/internal/dwarfgen/dwarf.go
index bdaa04339691c2555836443c69ca34bb62eccc82..179152f5bfa96bc1760c817256a8d19f9778007d 100644 (file)
--- a/src/cmd/compile/internal/dwarfgen/dwarf.go
+++ b/src/cmd/compile/internal/dwarfgen/dwarf.go
@@ -107,7 +107,7 @@ func Info(fnsym *obj.LSym, infosym *obj.LSym, curfn interface{}) ([]dwarf.Scope,
        // the function symbol to insure that the type included in DWARF
        // processing during linking.
        typesyms := []*obj.LSym{}
-       for t, _ := range fnsym.Func().Autot {
+       for t := range fnsym.Func().Autot {
                typesyms = append(typesyms, t)
        }
        sort.Sort(obj.BySymName(typesyms))

diff --git a/src/cmd/go/internal/modload/load.go b/src/cmd/go/internal/modload/load.go
index fcd93ba94b75a7fdcf19f892cd93e302ef039d23..d92e2ba7101d14438fe0f03979887dc1bb26bfc0 100644 (file)
--- a/src/cmd/go/internal/modload/load.go
+++ b/src/cmd/go/internal/modload/load.go
@@ -1105,7 +1105,7 @@ func loadFromRoots(ctx context.Context, params loaderParams) *loader {
                }
 
                toAdd := make([]module.Version, 0, len(modAddedBy))
-               for m, _ := range modAddedBy {
+               for m := range modAddedBy {
                        toAdd = append(toAdd, m)
                }
                module.Sort(toAdd) // to make errors deterministic

diff --git a/src/cmd/go/internal/modload/query.go b/src/cmd/go/internal/modload/query.go
index c74c9b32e2dd56e02258d29c551744295f3a4a4d..c3764b44133b17f784dda769e8adb4dde4f327e0 100644 (file)
--- a/src/cmd/go/internal/modload/query.go
+++ b/src/cmd/go/internal/modload/query.go
@@ -1116,7 +1116,7 @@ func (rr *replacementRepo) Versions(prefix string) (*modfetch.Versions, error) {
        for _, mm := range MainModules.Versions() {
                if index := MainModules.Index(mm); index != nil && len(index.replace) > 0 {
                        path := rr.ModulePath()
-                       for m, _ := range index.replace {
+                       for m := range index.replace {
                                if m.Path == path && strings.HasPrefix(m.Version, prefix) && m.Version != "" && !module.IsPseudoVersion(m.Version) {
                                        versions = append(versions, m.Version)
                                }

diff --git a/src/cmd/go/internal/workcmd/use.go b/src/cmd/go/internal/workcmd/use.go
index 6da64b3f09e053480bdb3fe97d3743c9d2bd6ee1..fcb4e9e5f186d7a96d3f09b972cdbf3ab0be998f 100644 (file)
--- a/src/cmd/go/internal/workcmd/use.go
+++ b/src/cmd/go/internal/workcmd/use.go
@@ -149,7 +149,7 @@ func runUse(ctx context.Context, cmd *base.Command, args []string) {
 
                // Remove entries for subdirectories that no longer exist.
                // Because they don't exist, they will be skipped by Walk.
-               for absDir, _ := range haveDirs {
+               for absDir := range haveDirs {
                        if str.HasFilePathPrefix(absDir, absArg) {
                                if _, ok := keepDirs[absDir]; !ok {
                                        keepDirs[absDir] = "" // Mark for deletion.

diff --git a/src/cmd/internal/obj/ppc64/asm_test.go b/src/cmd/internal/obj/ppc64/asm_test.go
index aef442e485d46cd1d79e525c90b98df563c8ff81..ff18a5e46107a49cffa9c4704c3392fc1d15cc00 100644 (file)
--- a/src/cmd/internal/obj/ppc64/asm_test.go
+++ b/src/cmd/internal/obj/ppc64/asm_test.go
@@ -547,7 +547,7 @@ func TestAddrClassifier(t *testing.T) {
                case int:
                        expect = []int{tst.output.(int), tst.output.(int), tst.output.(int), tst.output.(int)}
                }
-               for i, _ := range ctxts {
+               for i := range ctxts {
                        if output := ctxts[i].aclass(&tst.arg); output != expect[i] {
                                t.Errorf("%s.aclass(%v) = %v, expected %v\n", name[i], tst.arg, DRconv(output), DRconv(expect[i]))
                        }

diff --git a/src/cmd/link/internal/ld/data.go b/src/cmd/link/internal/ld/data.go
index 1848cd7a5e7f363ffa0d2c29f3a8e9fce70ac60b..0f2fd214a7134712a0790923722c63231aee390b 100644 (file)
--- a/src/cmd/link/internal/ld/data.go
+++ b/src/cmd/link/internal/ld/data.go
@@ -2732,7 +2732,7 @@ func (ctxt *Link) address() []*sym.Segment {
                if gotAddr := ldr.SymValue(ctxt.GOT); gotAddr != 0 {
                        tocAddr = gotAddr + 0x8000
                }
-               for i, _ := range ctxt.DotTOC {
+               for i := range ctxt.DotTOC {
                        if i >= sym.SymVerABICount && i < sym.SymVerStatic { // these versions are not used currently
                                continue
                        }