Merge pull request #2 from remerge/4648-lint-shadow

4648 lint shadow

.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: go
 go:
-- "1.11.11"
+- "1.14"
 
 cache:
   directories:

mkf/Makefile.common

@@ -106,7 +106,7 @@ watch: $(TOOLS)/github.com/cespare/reflex
 # Use "GOFMT_EXCLUDES" to exclude files from gofmt and goimports.
 # Use "VET_FLAGS" to define vet linter flags.
 
-lint:: .lint-mod-tidy .lint-fmt .lint-goimports .lint-vet .lint-revive .lint-fix ## run all linters
+lint:: .lint-mod-tidy .lint-fmt .lint-goimports .lint-vet .lint-shadow .lint-revive .lint-fix ## run all linters
 
 lint-mkf: check-makefile-remote
 	@DIFF=`git diff --name-only --relative HEAD:$(MKF_PREFIX)/ makefile/$(MKF_BRANCH):./` && echo "$$DIFF" && test -z "$$DIFF"
@@ -122,6 +122,10 @@ lint-mkf: check-makefile-remote
 	go vet $(VET_FLAGS) ./...
 .NOTPARALLEL: .lint-vet
 
+.lint-shadow: $(TOOLS)/golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow $(GO_SOURCES) ## run shadow linter
+	go vet -vettool=$< ./...
+.NOTPARALLEL: .lint-shadow
+
 REVIVE_CONFIG = $(or $(wildcard revive.toml),$(MKF_PREFIX)/revive.toml)
 .lint-revive: $(TOOLS)/github.com/mgechev/revive $(GO_SOURCES) $(REVIVE_CONFIG)	## run revive linter
 	$< -config $(REVIVE_CONFIG) -formatter friendly -exclude ./vendor/... $(REVIVELINTER_EXCLUDES) ./...

uniuri/uniuri_test.go

@@ -37,10 +37,10 @@ func TestNew(t *testing.T) {
 	for i := range uris {
 		uris[i] = New()
 	}
-	for i, u := range uris {
+	for i, u1 := range uris {
 		for j, u2 := range uris {
-			if i != j && u == u2 {
-				t.Fatalf("not unique: %d:%q and %d:%q", i, u, j, u2)
+			if i != j && u1 == u2 {
+				t.Fatalf("not unique: %d:%q and %d:%q", i, u1, j, u2)
 			}
 		}
 	}

uuid/uuid_test.go

@@ -27,8 +27,8 @@ func TestConstants(t *testing.T) {
 		if !ok {
 			t.Errorf("%x: %v: not a stringer", x, v)
 		} else if s := v.String(); s != tt.name {
-			v, _ := tt.c.(int)
-			t.Errorf("%x: Constant %T:%d gives %q, expected %q", x, tt.c, v, s, tt.name)
+			v2, _ := tt.c.(int)
+			t.Errorf("%x: Constant %T:%d gives %q, expected %q", x, tt.c, v2, s, tt.name)
 		}
 	}
 }