throughout: simplify two-variable ranges with unused second variable

R=golang-dev, gri
CC=golang-dev
https://golang.org/cl/3529041

diff --git a/src/cmd/godoc/godoc.go b/src/cmd/godoc/godoc.go
index 8fce6cd213105dc5a93704c22468d8bc236134fe..ff51c4dd86c366712242ad969de1538af90b8c2c 100644 (file)
--- a/src/cmd/godoc/godoc.go
+++ b/src/cmd/godoc/godoc.go
@@ -1182,7 +1182,7 @@ func (h *httpHandler) getPageInfo(abspath, relpath, pkgname string, mode PageInf
                // (excluding the selected package, if any).
                plist = make([]string, len(pkgs))
                i := 0
-               for name, _ := range pkgs {
+               for name := range pkgs {
                        if pkg == nil || name != pkg.Name {
                                plist[i] = name
                                i++

diff --git a/src/pkg/container/vector/numbers_test.go b/src/pkg/container/vector/numbers_test.go
index a44242f67b6e20a80c16647f90d5e11aff2c277d..93335ca60f2b9933e0e43d1e480553b3da28e93e 100644 (file)
--- a/src/pkg/container/vector/numbers_test.go
+++ b/src/pkg/container/vector/numbers_test.go
@@ -20,7 +20,7 @@ func s(n uint64) string {
        lens := len(str)
        a := make([]string, (lens+2)/3)
        start := lens
-       for i, _ := range a {
+       for i := range a {
                start -= 3
                if start < 0 {
                        start = 0

diff --git a/src/pkg/exp/draw/draw.go b/src/pkg/exp/draw/draw.go
index 2f3139d69b4701c8e1577f54c7b119556813e709..c94ae83a4279c23ec7ad9552508a83d5f6764e46 100644 (file)
--- a/src/pkg/exp/draw/draw.go
+++ b/src/pkg/exp/draw/draw.go
@@ -268,7 +268,7 @@ func drawFillSrc(dst *image.RGBA, r image.Rectangle, src *image.ColorImage) {
        dbase := dy0 * dst.Stride
        i0, i1 := dbase+dx0, dbase+dx1
        firstRow := dst.Pix[i0:i1]
-       for i, _ := range firstRow {
+       for i := range firstRow {
                firstRow[i] = color
        }
        for y := dy0 + 1; y < dy1; y++ {

diff --git a/src/pkg/go/parser/parser_test.go b/src/pkg/go/parser/parser_test.go
index 9c9a428b87706d84746a8eb37a6c38a07bc382f0..56bd80ef1fc635bd1a1696f37057e9b6a26f2c8c 100644 (file)
--- a/src/pkg/go/parser/parser_test.go
+++ b/src/pkg/go/parser/parser_test.go
@@ -104,7 +104,7 @@ func TestParse4(t *testing.T) {
                t.Errorf(`package "parser" not found`)
                return
        }
-       for filename, _ := range pkg.Files {
+       for filename := range pkg.Files {
                if !nameFilter(filename) {
                        t.Errorf("unexpected package file: %s", filename)
                }

diff --git a/src/pkg/http/transfer.go b/src/pkg/http/transfer.go
index 75030e87dfbb537738fb7712148217ae03ea3838..e62885d62fd5a94e05633e631d30d29908c01a62 100644 (file)
--- a/src/pkg/http/transfer.go
+++ b/src/pkg/http/transfer.go
@@ -108,7 +108,7 @@ func (t *transferWriter) WriteHeader(w io.Writer) (err os.Error) {
                // writing long headers, using HTTP line splitting
                io.WriteString(w, "Trailer: ")
                needComma := false
-               for k, _ := range t.Trailer {
+               for k := range t.Trailer {
                        k = CanonicalHeaderKey(k)
                        switch k {
                        case "Transfer-Encoding", "Trailer", "Content-Length":

diff --git a/src/pkg/index/suffixarray/suffixarray.go b/src/pkg/index/suffixarray/suffixarray.go
index 4839dbb146a938e27315e2bf6bc768a63ece31dc..2d728e2c3aeb511856235a5ab03e6b2a6e6f9936 100644 (file)
--- a/src/pkg/index/suffixarray/suffixarray.go
+++ b/src/pkg/index/suffixarray/suffixarray.go
@@ -40,7 +40,7 @@ type Index struct {
 //
 func New(data []byte) *Index {
        sa := make([]int, len(data))
-       for i, _ := range sa {
+       for i := range sa {
                sa[i] = i
        }
        x := &Index{data, sa}

diff --git a/src/pkg/reflect/type.go b/src/pkg/reflect/type.go
index d87ccc984c396615d3f42a774d34bba49767708a..9a7467b32d69090ed28ed70a79a031c3dbe65242 100644 (file)
--- a/src/pkg/reflect/type.go
+++ b/src/pkg/reflect/type.go
@@ -550,7 +550,7 @@ func (t *StructType) fieldByNameFunc(match func(string) bool, mark map[*StructTy
        var fi int // field index
        n := 0     // number of matching fields at depth fd
 L:
-       for i, _ := range t.fields {
+       for i := range t.fields {
                f := t.Field(i)
                d := inf
                switch {

diff --git a/src/pkg/unicode/maketables.go b/src/pkg/unicode/maketables.go
index c8e7eb442008edfd93fd3f473865c24ae9aa2081..081e1a1198f1a64ddcdbb4e99a2613e0850a215e 100644 (file)
--- a/src/pkg/unicode/maketables.go
+++ b/src/pkg/unicode/maketables.go
@@ -326,7 +326,7 @@ func printCategories() {
        if *tablelist == "all" {
                fmt.Println("// Categories is the set of Unicode data tables.")
                fmt.Println("var Categories = map[string] []Range {")
-               for k, _ := range category {
+               for k := range category {
                        fmt.Printf("\t%q: %s,\n", k, k)
                }
                fmt.Print("}\n\n")
@@ -594,7 +594,7 @@ func printScriptOrProperty(doProps bool) {
                        fmt.Println("// Scripts is the set of Unicode script tables.")
                        fmt.Println("var Scripts = map[string] []Range {")
                }
-               for k, _ := range table {
+               for k := range table {
                        fmt.Printf("\t%q: %s,\n", k, k)
                }
                fmt.Print("}\n\n")

diff --git a/test/blank.go b/test/blank.go
index b9d3a32a8176305b8ad01c050fb6ba3a619a4542..6e69f8aaaeb6eab4a0c3f68654fd2706c46a4c2b 100644 (file)
--- a/test/blank.go
+++ b/test/blank.go
@@ -77,7 +77,7 @@ func main() {
        if out != "123" {panic(out)}
 
        sum := 0
-       for s, _ := range ints {
+       for s := range ints {
                sum += s
        }
        if sum != 3 {panic(sum)}