From 671b9204b8535d162539565b87e7c0d66243efd7 Mon Sep 17 00:00:00 2001
From: Rob Pike <r@golang.org>
Date: Sun, 24 Aug 2014 17:26:18 -0700
Subject: [PATCH] go.tools/cmd/vet: change message for range check s/enclosed
 by function/captured by func literal/ Users complained. They often do.

LGTM=josharian, adg
R=golang-codereviews, josharian, nightlyone, minux, adg
CC=golang-codereviews
https://golang.org/cl/132080043
---
 cmd/vet/rangeloop.go          |  2 +-
 cmd/vet/testdata/rangeloop.go | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cmd/vet/rangeloop.go b/cmd/vet/rangeloop.go
index d318915a..96e2ca80 100644
--- a/cmd/vet/rangeloop.go
+++ b/cmd/vet/rangeloop.go
@@ -63,7 +63,7 @@ func checkRangeLoop(f *File, node ast.Node) {
 			return true
 		}
 		if key != nil && id.Obj == key.Obj || val != nil && id.Obj == val.Obj {
-			f.Bad(id.Pos(), "range variable", id.Name, "enclosed by function")
+			f.Bad(id.Pos(), "range variable", id.Name, "captured by func literal")
 		}
 		return true
 	})
diff --git a/cmd/vet/testdata/rangeloop.go b/cmd/vet/testdata/rangeloop.go
index 331e5d08..37b5940d 100644
--- a/cmd/vet/testdata/rangeloop.go
+++ b/cmd/vet/testdata/rangeloop.go
@@ -10,24 +10,24 @@ func RangeLoopTests() {
 	var s []int
 	for i, v := range s {
 		go func() {
-			println(i) // ERROR "range variable i enclosed by function"
-			println(v) // ERROR "range variable v enclosed by function"
+			println(i) // ERROR "range variable i captured by func literal"
+			println(v) // ERROR "range variable v captured by func literal"
 		}()
 	}
 	for i, v := range s {
 		defer func() {
-			println(i) // ERROR "range variable i enclosed by function"
-			println(v) // ERROR "range variable v enclosed by function"
+			println(i) // ERROR "range variable i captured by func literal"
+			println(v) // ERROR "range variable v captured by func literal"
 		}()
 	}
 	for i := range s {
 		go func() {
-			println(i) // ERROR "range variable i enclosed by function"
+			println(i) // ERROR "range variable i captured by func literal"
 		}()
 	}
 	for _, v := range s {
 		go func() {
-			println(v) // ERROR "range variable v enclosed by function"
+			println(v) // ERROR "range variable v captured by func literal"
 		}()
 	}
 	for i, v := range s {
@@ -53,7 +53,7 @@ func RangeLoopTests() {
 	var f int
 	for x[0], f = range s {
 		go func() {
-			_ = f // ERROR "range variable f enclosed by function"
+			_ = f // ERROR "range variable f captured by func literal"
 		}()
 	}
 }