all: few tweaks to vet fixes

See golang/go#18085. And CL 80143.

Change-Id: I2ac1eaf1d64a451fbdb7a1e32ad3774b3dabd2f5
Reviewed-on: https://go-review.googlesource.com/80596
Run-TryBot: Marcel van Lohuizen <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>
Reviewed-by: Brad Fitzpatrick <[email protected]>
Reviewed-by: Nigel Tao <[email protected]>

Author: mpvl

message/fmt_test.go

@@ -1787,10 +1787,10 @@ func TestNilDoesNotBecomeTyped(t *testing.T) {
 	var a *A = nil
 	var b B = B{}
 
-	// indirect the Sprintf call through this f variable to avoid
+	// indirect the Sprintf call through this noVetWarn variable to avoid
 	// "go test" failing vet checks in Go 1.10+.
-	f := p.Sprintf
-	got := f("%s %s %s %s %s", nil, a, nil, b, nil)
+	noVetWarn := p.Sprintf
+	got := noVetWarn("%s %s %s %s %s", nil, a, nil, b, nil)
 
 	const expect = "%!s(<nil>) %!s(*message.A=<nil>) %!s(<nil>) {} %!s(<nil>)"
 	if got != expect {

number/format_test.go

@@ -99,7 +99,8 @@ func TestPluralIntegration(t *testing.T) {
 			p := message.NewPrinter(language.English)
 
 			// Indirect the call to p.Sprintf through the variable f
-			// to avoid Go 1.10+ go test failing a vet check.
+			// to avoid Go tip failing a vet check.
+			// TODO: remove once vet check has been fixed. See Issue #22936.
 			f := p.Sprintf
 			got := f("num %f", tc.f)