[go] cmd/vet: tighten printf format error messages
1,380 views
Skip to first unread message
Russ Cox (Gerrit)
Oct 30, 2017, 11:25:55 AM10/30/17
to Ian Lance Taylor, Rob Pike, goph...@pubsubhelper.golang.org, Russ Cox, golang-co...@googlegroups.com
Russ Cox has uploaded this change for review.
cmd/vet: tighten printf format error messages
Every time I see an error that begins `missing argument for Fprintf("%s")`
my mental type-checker goes off, since obviously "%s" is not a valid first
argument to Fprintf. Writing Printf("%s") to report an error in Printf("hello %s")
is almost as confusing.
This CL rewords the errors reported by vet's printf check to be more
consistent with each other, avoid placing context like "in printf call"
in the middle of the message, and to avoid the imprecisions above by
not quoting the format string at all.
Before:
bad.go:9: no formatting directive in Printf call
bad.go:10: missing argument for Printf("%s"): format reads arg 1, have only 0 args
bad.go:11: wrong number of args for format in Printf call: 1 needed but 2 args
bad.go:12: bad syntax for printf argument index: [1]
bad.go:13: index value [0] for Printf("%[0]s"); indexes start at 1
bad.go:14: missing argument for Printf("%[2]s"): format reads arg 2, have only 1 args
bad.go:15: bad syntax for printf argument index: [abc]
bad.go:16: unrecognized printf verb 'z'
bad.go:17: arg "hello" for * in printf format not of type int
bad.go:18: arg fmt.Sprint in printf call is a function value, not a function call
bad.go:19: arg fmt.Sprint in Print call is a function value, not a function call
bad.go:20: arg "world" for printf verb %d of wrong type: string
bad.go:21: missing argument for Printf("%q"): format reads arg 2, have only 1 args
bad.go:22: first argument to Print is os.Stderr
bad.go:23: Println call ends with newline
bad.go:32: arg r in Sprint call causes recursive call to String method
bad.go:34: arg r for printf causes recursive call to String method
After:
bad.go:9: Printf call has arguments but no formatting directives
bad.go:10: Printf format %s reads arg #1, but have only 0 args
bad.go:11: Printf call needs 1 args but has 2 args
bad.go:12: Printf format %[1 is missing closing ]
bad.go:13: Printf format has invalid argument index [0]
bad.go:14: Printf format has invalid argument index [2]
bad.go:15: Printf format has invalid argument index [abc]
bad.go:16: Printf format %.234z has unknown verb z
bad.go:17: Printf format %.*s uses non-int "hello" as argument of *
bad.go:18: Printf format %s arg fmt.Sprint is a func value, not called
bad.go:19: Print arg fmt.Sprint is a func value, not called
bad.go:20: Printf format %d has arg "world" of wrong type string
bad.go:21: Printf format %q reads arg #2, but have only 1 args
bad.go:22: Print does not take io.Writer but has first arg os.Stderr
bad.go:23: Println args end with redundant newline
bad.go:32: Sprint arg r causes recursive call to String method
bad.go:34: Sprintf format %s with arg r causes recursive String method call
Change-Id: I5719f0fb9f2cd84df8ad4c7754ab9b79c691b060
---
M src/cmd/vet/print.go
M src/cmd/vet/testdata/print.go
M src/cmd/vet/testdata/shift.go
3 files changed, 149 insertions(+), 135 deletions(-)
diff --git a/src/cmd/vet/print.go b/src/cmd/vet/print.go
index 21bb0d0..22ff0d8 100644
--- a/src/cmd/vet/print.go
+++ b/src/cmd/vet/print.go
@@ -13,6 +13,7 @@
"go/constant"
"go/token"
"go/types"
+ "regexp"
"strconv"
"strings"
"unicode/utf8"
@@ -88,8 +89,8 @@
// The first string literal or string constant is assumed to be a format string
// if the call's signature cannot be determined.
//
-// If it cannot find any format string parameter, it returns ("", -1).
-func formatString(f *File, call *ast.CallExpr) (string, int) {
+// If it cannot find any format string parameter, it returns ("", -1).
+func formatString(f *File, call *ast.CallExpr) (format string, idx int) {
typ := f.pkg.types[call.Fun].Type
if typ != nil {
if sig, ok := typ.(*types.Signature); ok {
@@ -106,7 +107,7 @@
s, ok := stringConstantArg(f, call, idx)
if !ok {
// The last argument before variadic args isn't a string.
- return "", -1
+ return "", idx
}
return s, idx
}
@@ -228,7 +229,7 @@
firstArg := idx + 1 // Arguments are immediately after format string.
if !strings.Contains(format, "%") {
if len(call.Args) > firstArg {
- f.Badf(call.Pos(), "no formatting directive in %s call", name)
+ f.Badf(call.Pos(), "%s call has arguments but no formatting directives", name)
}
return
}
@@ -266,7 +267,7 @@
if maxArgNum != len(call.Args) {
expect := maxArgNum - firstArg
numArgs := len(call.Args) - firstArg
- f.Badf(call.Pos(), "wrong number of args for format in %s call: %d needed but %d args", name, expect, numArgs)
+ f.Badf(call.Pos(), "%s call needs %d args but has %d args", name, expect, numArgs)
}
}
@@ -302,17 +303,18 @@
s.nbytes++ // skip '['
start := s.nbytes
s.scanNum()
+ ok := true
if s.nbytes == len(s.format) || s.nbytes == start || s.format[s.nbytes] != ']' {
- end := strings.Index(s.format, "]")
- if end < 0 {
- end = len(s.format)
+ ok = false
+ s.nbytes = strings.Index(s.format, "]")
+ if s.nbytes < 0 {
+ s.file.Badf(s.call.Pos(), "%s format %s is missing closing ]", s.name, s.format)
+ return false
}
- s.file.Badf(s.call.Pos(), "bad syntax for printf argument index: [%s]", s.format[start:end])
- return false
}
arg32, err := strconv.ParseInt(s.format[start:s.nbytes], 10, 32)
- if err != nil {
- s.file.Badf(s.call.Pos(), "bad syntax for printf argument index: %s", err)
+ if err != nil || !ok || arg32 <= 0 || arg32 > int64(len(s.call.Args)-s.firstArg) {
+ s.file.Badf(s.call.Pos(), "%s format has invalid argument index [%s]", s.name, s.format[start:s.nbytes])
return false
}
s.nbytes++ // skip ']'
@@ -388,7 +390,7 @@
return nil
}
if state.nbytes == len(state.format) {
- f.Badf(call.Pos(), "missing verb at end of format string in %s call", name)
+ f.Badf(call.Pos(), "%s format %s is missing verb at end of string", name, state.format)
return nil
}
verb, w := utf8.DecodeRuneInString(state.format[state.nbytes:])
@@ -481,12 +483,12 @@
}
if !found && !formatter {
- f.Badf(call.Pos(), "unrecognized printf verb %q", state.verb)
+ f.Badf(call.Pos(), "%s format %s has unknown verb %c", state.name, state.format, state.verb)
return false
}
for _, flag := range state.flags {
if !strings.ContainsRune(v.flags, rune(flag)) {
- f.Badf(call.Pos(), "unrecognized printf flag for verb %q: %q", state.verb, flag)
+ f.Badf(call.Pos(), "%s format %s has unrecognized flag %c", state.name, state.format, flag)
return false
}
}
@@ -504,7 +506,7 @@
}
arg := call.Args[argNum]
if !f.matchArgType(argInt, nil, arg) {
- f.Badf(call.Pos(), "arg %s for * in printf format not of type int", f.gofmt(arg))
+ f.Badf(call.Pos(), "%s format %s uses non-int %s as argument of *", state.name, state.format, f.gofmt(arg))
return false
}
}
@@ -517,7 +519,7 @@
}
arg := call.Args[argNum]
if f.isFunctionValue(arg) && state.verb != 'p' && state.verb != 'T' {
- f.Badf(call.Pos(), "arg %s in printf call is a function value, not a function call", f.gofmt(arg))
+ f.Badf(call.Pos(), "%s format %s arg %s is a func value, not called", state.name, state.format, f.gofmt(arg))
return false
}
if !f.matchArgType(v.typ, nil, arg) {
@@ -525,11 +527,11 @@
if typ := f.pkg.types[arg].Type; typ != nil {
typeString = typ.String()
}
- f.Badf(call.Pos(), "arg %s for printf verb %%%c of wrong type: %s", f.gofmt(arg), state.verb, typeString)
+ f.Badf(call.Pos(), "%s format %s has arg %s of wrong type %s", state.name, state.format, f.gofmt(arg), typeString)
return false
}
if v.typ&argString != 0 && v.verb != 'T' && !bytes.Contains(state.flags, []byte{'#'}) && f.recursiveStringer(arg) {
- f.Badf(call.Pos(), "arg %s for printf causes recursive call to String method", f.gofmt(arg))
+ f.Badf(call.Pos(), "%s format %s with arg %s causes recursive String method call", state.name, state.format, f.gofmt(arg))
return false
}
return true
@@ -580,14 +582,10 @@
// means we can't see it.
func (f *File) argCanBeChecked(call *ast.CallExpr, formatArg int, state *formatState) bool {
argNum := state.argNums[formatArg]
- if argNum < 0 {
+ if argNum <= 0 {
// Shouldn't happen, so catch it with prejudice.
panic("negative arg num")
}
- if argNum == 0 {
- f.Badf(call.Pos(), `index value [0] for %s("%s"); indexes start at 1`, state.name, state.format)
- return false
- }
if argNum < len(call.Args)-1 {
return true // Always OK.
}
@@ -600,10 +598,15 @@
// There are bad indexes in the format or there are fewer arguments than the format needs.
// This is the argument number relative to the format: Printf("%s", "hi") will give 1 for the "hi".
arg := argNum - state.firstArg + 1 // People think of arguments as 1-indexed.
- f.Badf(call.Pos(), `missing argument for %s("%s"): format reads arg %d, have only %d args`, state.name, state.format, arg, len(call.Args)-state.firstArg)
+ f.Badf(call.Pos(), "%s format %s reads arg #%d, but have only %d args", state.name, state.format, arg, len(call.Args)-state.firstArg)
return false
}
+// printFormatRE is the regexp we match and report as a possible format string
+// in the first argument to unformatted prints like fmt.Print.
+// We exclude the space flag, so that printing a string like "x % y" is not reported as a format.
+var printFormatRE = regexp.MustCompile(`%[+\-#]*([0-9]+|(\[\d+\])?\*)?\.?([0-9]+|(\[\d+\])?\*)?(\[\d+\])?[a-zA-Z%]`)
+
// checkPrint checks a call to an unformatted print routine such as Println.
func (f *File) checkPrint(call *ast.CallExpr, name string) {
firstArg := 0
@@ -635,23 +638,26 @@
}
args = args[firstArg:]
- // check for Println(os.Stderr, ...)
if firstArg == 0 {
- if sel, ok := args[0].(*ast.SelectorExpr); ok {
+ if sel, ok := call.Args[0].(*ast.SelectorExpr); ok {
if x, ok := sel.X.(*ast.Ident); ok {
if x.Name == "os" && strings.HasPrefix(sel.Sel.Name, "Std") {
- f.Badf(call.Pos(), "first argument to %s is %s.%s", name, x.Name, sel.Sel.Name)
+ f.Badf(call.Pos(), "%s does not take io.Writer but has first arg %s", name, f.gofmt(call.Args[0]))
}
}
}
}
+
arg := args[0]
if lit, ok := arg.(*ast.BasicLit); ok && lit.Kind == token.STRING {
// Ignore trailing % character in lit.Value.
// The % in "abc 0.0%" couldn't be a formatting directive.
s := strings.TrimSuffix(lit.Value, `%"`)
if strings.Contains(s, "%") {
- f.Badf(call.Pos(), "possible formatting directive in %s call", name)
+ m := printFormatRE.FindStringSubmatch(s)
+ if m != nil {
+ f.Badf(call.Pos(), "%s call has possible formatting directive %s", name, m[0])
+ }
}
}
if strings.HasSuffix(name, "ln") {
@@ -659,16 +665,16 @@
arg = args[len(args)-1]
if lit, ok := arg.(*ast.BasicLit); ok && lit.Kind == token.STRING {
if strings.HasSuffix(lit.Value, `\n"`) {
- f.Badf(call.Pos(), "%s call ends with newline", name)
+ f.Badf(call.Pos(), "%s args end with redundant newline", name)
}
}
}
for _, arg := range args {
if f.isFunctionValue(arg) {
- f.Badf(call.Pos(), "arg %s in %s call is a function value, not a function call", f.gofmt(arg), name)
+ f.Badf(call.Pos(), "%s arg %s is a func value, not called", name, f.gofmt(arg))
}
if f.recursiveStringer(arg) {
- f.Badf(call.Pos(), "arg %s in %s call causes recursive call to String method", f.gofmt(arg), name)
+ f.Badf(call.Pos(), "%s arg %s causes recursive call to String method", name, f.gofmt(arg))
}
}
}
diff --git a/src/cmd/vet/testdata/print.go b/src/cmd/vet/testdata/print.go
index 38743b1..a2ee537 100644
--- a/src/cmd/vet/testdata/print.go
+++ b/src/cmd/vet/testdata/print.go
@@ -104,74 +104,74 @@
fmt.Printf("%g", 1+2i)
fmt.Printf("%#e %#E %#f %#F %#g %#G", 1.2, 1.2, 1.2, 1.2, 1.2, 1.2) // OK since Go 1.9
// Some bad format/argTypes
- fmt.Printf("%b", "hi") // ERROR "arg .hi. for printf verb %b of wrong type"
- fmt.Printf("%t", c) // ERROR "arg c for printf verb %t of wrong type"
- fmt.Printf("%t", 1+2i) // ERROR "arg 1 \+ 2i for printf verb %t of wrong type"
- fmt.Printf("%c", 2.3) // ERROR "arg 2.3 for printf verb %c of wrong type"
- fmt.Printf("%d", 2.3) // ERROR "arg 2.3 for printf verb %d of wrong type"
- fmt.Printf("%e", "hi") // ERROR "arg .hi. for printf verb %e of wrong type"
- fmt.Printf("%E", true) // ERROR "arg true for printf verb %E of wrong type"
- fmt.Printf("%f", "hi") // ERROR "arg .hi. for printf verb %f of wrong type"
- fmt.Printf("%F", 'x') // ERROR "arg 'x' for printf verb %F of wrong type"
- fmt.Printf("%g", "hi") // ERROR "arg .hi. for printf verb %g of wrong type"
- fmt.Printf("%g", imap) // ERROR "arg imap for printf verb %g of wrong type"
- fmt.Printf("%G", i) // ERROR "arg i for printf verb %G of wrong type"
- fmt.Printf("%o", x) // ERROR "arg x for printf verb %o of wrong type"
- fmt.Printf("%p", 23) // ERROR "arg 23 for printf verb %p of wrong type"
- fmt.Printf("%q", x) // ERROR "arg x for printf verb %q of wrong type"
- fmt.Printf("%s", b) // ERROR "arg b for printf verb %s of wrong type"
- fmt.Printf("%s", byte(65)) // ERROR "arg byte\(65\) for printf verb %s of wrong type"
- fmt.Printf("%t", 23) // ERROR "arg 23 for printf verb %t of wrong type"
- fmt.Printf("%U", x) // ERROR "arg x for printf verb %U of wrong type"
- fmt.Printf("%x", nil) // ERROR "arg nil for printf verb %x of wrong type"
- fmt.Printf("%X", 2.3) // ERROR "arg 2.3 for printf verb %X of wrong type"
- fmt.Printf("%s", stringerv) // ERROR "arg stringerv for printf verb %s of wrong type"
- fmt.Printf("%t", stringerv) // ERROR "arg stringerv for printf verb %t of wrong type"
- fmt.Printf("%s", embeddedStringerv) // ERROR "arg embeddedStringerv for printf verb %s of wrong type"
- fmt.Printf("%t", embeddedStringerv) // ERROR "arg embeddedStringerv for printf verb %t of wrong type"
- fmt.Printf("%q", notstringerv) // ERROR "arg notstringerv for printf verb %q of wrong type"
- fmt.Printf("%t", notstringerv) // ERROR "arg notstringerv for printf verb %t of wrong type"
- fmt.Printf("%t", stringerarrayv) // ERROR "arg stringerarrayv for printf verb %t of wrong type"
- fmt.Printf("%t", notstringerarrayv) // ERROR "arg notstringerarrayv for printf verb %t of wrong type"
- fmt.Printf("%q", notstringerarrayv) // ERROR "arg notstringerarrayv for printf verb %q of wrong type"
- fmt.Printf("%d", Formatter(true)) // ERROR "arg Formatter\(true\) for printf verb %d of wrong type: testdata.Formatter"
- fmt.Printf("%z", FormatterVal(true)) // correct (the type is responsible for formatting)
- fmt.Printf("%d", FormatterVal(true)) // correct (the type is responsible for formatting)
- fmt.Printf("%s", nonemptyinterface) // correct (the type is responsible for formatting)
- fmt.Printf("%.*s %d %g", 3, "hi", 23, 'x') // ERROR "arg 'x' for printf verb %g of wrong type"
- fmt.Println() // not an error
- fmt.Println("%s", "hi") // ERROR "possible formatting directive in Println call"
- fmt.Println("0.0%") // correct (trailing % couldn't be a formatting directive)
- fmt.Printf("%s", "hi", 3) // ERROR "wrong number of args for format in Printf call"
- _ = fmt.Sprintf("%"+("s"), "hi", 3) // ERROR "wrong number of args for format in Sprintf call"
- fmt.Printf("%s%%%d", "hi", 3) // correct
- fmt.Printf("%08s", "woo") // correct
- fmt.Printf("% 8s", "woo") // correct
- fmt.Printf("%.*d", 3, 3) // correct
- fmt.Printf("%.*d", 3, 3, 3, 3) // ERROR "wrong number of args for format in Printf call.*4 args"
- fmt.Printf("%.*d", "hi", 3) // ERROR "arg .hi. for \* in printf format not of type int"
- fmt.Printf("%.*d", i, 3) // correct
- fmt.Printf("%.*d", s, 3) // ERROR "arg s for \* in printf format not of type int"
- fmt.Printf("%*%", 0.22) // ERROR "arg 0.22 for \* in printf format not of type int"
- fmt.Printf("%q %q", multi()...) // ok
- fmt.Printf("%#q", `blah`) // ok
- printf("now is the time", "buddy") // ERROR "no formatting directive"
- Printf("now is the time", "buddy") // ERROR "no formatting directive"
- Printf("hi") // ok
+ fmt.Printf("%b", "hi") // ERROR "Printf format %b has arg \x22hi\x22 of wrong type string"
+ fmt.Printf("%t", c) // ERROR "Printf format %t has arg c of wrong type complex64"
+ fmt.Printf("%t", 1+2i) // ERROR "Printf format %t has arg 1 \+ 2i of wrong type complex128"
+ fmt.Printf("%c", 2.3) // ERROR "Printf format %c has arg 2.3 of wrong type float64"
+ fmt.Printf("%d", 2.3) // ERROR "Printf format %d has arg 2.3 of wrong type float64"
+ fmt.Printf("%e", "hi") // ERROR "Printf format %e has arg \x22hi\x22 of wrong type string"
+ fmt.Printf("%E", true) // ERROR "Printf format %E has arg true of wrong type bool"
+ fmt.Printf("%f", "hi") // ERROR "Printf format %f has arg \x22hi\x22 of wrong type string"
+ fmt.Printf("%F", 'x') // ERROR "Printf format %F has arg 'x' of wrong type rune"
+ fmt.Printf("%g", "hi") // ERROR "Printf format %g has arg \x22hi\x22 of wrong type string"
+ fmt.Printf("%g", imap) // ERROR "Printf format %g has arg imap of wrong type map\[int\]int"
+ fmt.Printf("%G", i) // ERROR "Printf format %G has arg i of wrong type int"
+ fmt.Printf("%o", x) // ERROR "Printf format %o has arg x of wrong type float64"
+ fmt.Printf("%p", 23) // ERROR "Printf format %p has arg 23 of wrong type int"
+ fmt.Printf("%q", x) // ERROR "Printf format %q has arg x of wrong type float64"
+ fmt.Printf("%s", b) // ERROR "Printf format %s has arg b of wrong type bool"
+ fmt.Printf("%s", byte(65)) // ERROR "Printf format %s has arg byte\(65\) of wrong type byte"
+ fmt.Printf("%t", 23) // ERROR "Printf format %t has arg 23 of wrong type int"
+ fmt.Printf("%U", x) // ERROR "Printf format %U has arg x of wrong type float64"
+ fmt.Printf("%x", nil) // ERROR "Printf format %x has arg nil of wrong type untyped nil"
+ fmt.Printf("%X", 2.3) // ERROR "Printf format %X has arg 2.3 of wrong type float64"
+ fmt.Printf("%s", stringerv) // ERROR "Printf format %s has arg stringerv of wrong type testdata.stringer"
+ fmt.Printf("%t", stringerv) // ERROR "Printf format %t has arg stringerv of wrong type testdata.stringer"
+ fmt.Printf("%s", embeddedStringerv) // ERROR "Printf format %s has arg embeddedStringerv of wrong type testdata.embeddedStringer"
+ fmt.Printf("%t", embeddedStringerv) // ERROR "Printf format %t has arg embeddedStringerv of wrong type testdata.embeddedStringer"
+ fmt.Printf("%q", notstringerv) // ERROR "Printf format %q has arg notstringerv of wrong type testdata.notstringer"
+ fmt.Printf("%t", notstringerv) // ERROR "Printf format %t has arg notstringerv of wrong type testdata.notstringer"
+ fmt.Printf("%t", stringerarrayv) // ERROR "Printf format %t has arg stringerarrayv of wrong type testdata.stringerarray"
+ fmt.Printf("%t", notstringerarrayv) // ERROR "Printf format %t has arg notstringerarrayv of wrong type testdata.notstringerarray"
+ fmt.Printf("%q", notstringerarrayv) // ERROR "Printf format %q has arg notstringerarrayv of wrong type testdata.notstringerarray"
+ fmt.Printf("%d", Formatter(true)) // ERROR "Printf format %d has arg Formatter\(true\) of wrong type testdata.Formatter"
+ fmt.Printf("%z", FormatterVal(true)) // correct (the type is responsible for formatting)
+ fmt.Printf("%d", FormatterVal(true)) // correct (the type is responsible for formatting)
+ fmt.Printf("%s", nonemptyinterface) // correct (the type is responsible for formatting)
+ fmt.Printf("%.*s %d %6g", 3, "hi", 23, 'x') // ERROR "Printf format %6g has arg 'x' of wrong type rune"
+ fmt.Println() // not an error
+ fmt.Println("%s", "hi") // ERROR "Println call has possible formatting directive %s"
+ fmt.Println("0.0%") // correct (trailing % couldn't be a formatting directive)
+ fmt.Printf("%s", "hi", 3) // ERROR "Printf call needs 1 args but has 2 args"
+ _ = fmt.Sprintf("%"+("s"), "hi", 3) // ERROR "Sprintf call needs 1 args but has 2 args"
+ fmt.Printf("%s%%%d", "hi", 3) // correct
+ fmt.Printf("%08s", "woo") // correct
+ fmt.Printf("% 8s", "woo") // correct
+ fmt.Printf("%.*d", 3, 3) // correct
+ fmt.Printf("%.*d x", 3, 3, 3, 3) // ERROR "Printf call needs 2 args but has 4 args"
+ fmt.Printf("%.*d x", "hi", 3) // ERROR "Printf format %.*d uses non-int \x22hi\x22 as argument of \*"
+ fmt.Printf("%.*d x", i, 3) // correct
+ fmt.Printf("%.*d x", s, 3) // ERROR "Printf format %.\*d uses non-int s as argument of \*"
+ fmt.Printf("%*% x", 0.22) // ERROR "Printf format %\*% uses non-int 0.22 as argument of \*"
+ fmt.Printf("%q %q", multi()...) // ok
+ fmt.Printf("%#q", `blah`) // ok
+ printf("now is the time", "buddy") // ERROR "printf call has arguments but no formatting directives"
+ Printf("now is the time", "buddy") // ERROR "Printf call has arguments but no formatting directives"
+ Printf("hi") // ok
const format = "%s %s\n"
Printf(format, "hi", "there")
- Printf(format, "hi") // ERROR "missing argument for Printf..%s..: format reads arg 2, have only 1"
- Printf("%s %d %.3v %q", "str", 4) // ERROR "missing argument for Printf..%.3v..: format reads arg 3, have only 2"
+ Printf(format, "hi") // ERROR "Printf format %s reads arg #2, but have only 1 args"
+ Printf("%s %d %.3v %q", "str", 4) // ERROR "Printf format %.3v reads arg #3, but have only 2 args"
f := new(stringer)
- f.Warn(0, "%s", "hello", 3) // ERROR "possible formatting directive in Warn call"
- f.Warnf(0, "%s", "hello", 3) // ERROR "wrong number of args for format in Warnf call"
- f.Warnf(0, "%r", "hello") // ERROR "unrecognized printf verb"
- f.Warnf(0, "%#s", "hello") // ERROR "unrecognized printf flag"
- Printf("d%", 2) // ERROR "missing verb at end of format string in Printf call"
+ f.Warn(0, "%s", "hello", 3) // ERROR "Warn call has possible formatting directive %s"
+ f.Warnf(0, "%s", "hello", 3) // ERROR "Warnf call needs 1 args but has 2 args"
+ f.Warnf(0, "%r", "hello") // ERROR "Warnf format %r has unknown verb r"
+ f.Warnf(0, "%#s", "hello") // ERROR "Warnf format %#s has unrecognized flag #"
+ Printf("d%", 2) // ERROR "Printf format % is missing verb at end of string"
Printf("%d", percentDV)
Printf("%d", &percentDV)
- Printf("%d", notPercentDV) // ERROR "arg notPercentDV for printf verb %d of wrong type"
- Printf("%d", ¬PercentDV) // ERROR "arg ¬PercentDV for printf verb %d of wrong type"
+ Printf("%d", notPercentDV) // ERROR "Printf format %d has arg notPercentDV of wrong type testdata.notPercentDStruct"
+ Printf("%d", ¬PercentDV) // ERROR "Printf format %d has arg ¬PercentDV of wrong type \*testdata.notPercentDStruct"
Printf("%p", ¬PercentDV) // Works regardless: we print it as a pointer.
Printf("%s", percentSV)
Printf("%s", &percentSV)
@@ -182,13 +182,13 @@
Printf("%[2]*.[1]*[3]d", 2, 3, 4)
fmt.Fprintf(os.Stderr, "%[2]*.[1]*[3]d", 2, 3, 4) // Use Fprintf to make sure we count arguments correctly.
// Bad argument reorderings.
- Printf("%[xd", 3) // ERROR "bad syntax for printf argument index: \[xd\]"
- Printf("%[x]d", 3) // ERROR "bad syntax for printf argument index: \[x\]"
- Printf("%[3]*s", "hi", 2) // ERROR "missing argument for Printf.* reads arg 3, have only 2"
- _ = fmt.Sprintf("%[3]d", 2) // ERROR "missing argument for Sprintf.* reads arg 3, have only 1"
- Printf("%[2]*.[1]*[3]d", 2, "hi", 4) // ERROR "arg .hi. for \* in printf format not of type int"
- Printf("%[0]s", "arg1") // ERROR "index value \[0\] for Printf.*; indexes start at 1"
- Printf("%[0]d", 1) // ERROR "index value \[0\] for Printf.*; indexes start at 1"
+ Printf("%[xd", 3) // ERROR "Printf format %\[xd is missing closing \]"
+ Printf("%[x]d x", 3) // ERROR "Printf format has invalid argument index \[x\]"
+ Printf("%[3]*s x", "hi", 2) // ERROR "Printf format has invalid argument index \[3\]"
+ _ = fmt.Sprintf("%[3]d x", 2) // ERROR "Sprintf format has invalid argument index \[3\]"
+ Printf("%[2]*.[1]*[3]d x", 2, "hi", 4) // ERROR "Printf format %\[2]\*\.\[1\]\*\[3\]d uses non-int \x22hi\x22 as argument of \*"
+ Printf("%[0]s x", "arg1") // ERROR "Printf format has invalid argument index \[0\]"
+ Printf("%[0]d x", 1) // ERROR "Printf format has invalid argument index \[0\]"
// Something that satisfies the error interface.
var e error
fmt.Println(e.Error()) // ok
@@ -197,11 +197,11 @@
var et1 errorTest1
fmt.Println(et1.Error()) // ok
fmt.Println(et1.Error("hi")) // ok
- fmt.Println(et1.Error("%d", 3)) // ERROR "possible formatting directive in Error call"
+ fmt.Println(et1.Error("%d", 3)) // ERROR "Error call has possible formatting directive %d"
var et2 errorTest2
et2.Error() // ok
et2.Error("hi") // ok, not an error method.
- et2.Error("%d", 3) // ERROR "possible formatting directive in Error call"
+ et2.Error("%d", 3) // ERROR "Error call has possible formatting directive %d"
var et3 errorTest3
et3.Error() // ok, not an error method.
var et4 errorTest4
@@ -214,9 +214,9 @@
}
fmt.Printf("%f", iface) // ok: fmt treats interfaces as transparent and iface may well have a float concrete type
// Can't print a function.
- Printf("%d", someFunction) // ERROR "arg someFunction in printf call is a function value, not a function call"
- Printf("%v", someFunction) // ERROR "arg someFunction in printf call is a function value, not a function call"
- Println(someFunction) // ERROR "arg someFunction in Println call is a function value, not a function call"
+ Printf("%d", someFunction) // ERROR "Printf format %d arg someFunction is a func value, not called"
+ Printf("%v", someFunction) // ERROR "Printf format %v arg someFunction is a func value, not called"
+ Println(someFunction) // ERROR "Println arg someFunction is a func value, not called"
Printf("%p", someFunction) // ok: maybe someone wants to see the pointer
Printf("%T", someFunction) // ok: maybe someone wants to see the type
// Bug: used to recur forever.
@@ -227,17 +227,17 @@
// Special handling for Log.
math.Log(3) // OK
Log(3) // OK
- Log("%d", 3) // ERROR "possible formatting directive in Log call"
+ Log("%d", 3) // ERROR "Log call has possible formatting directive %d"
Logf("%d", 3)
- Logf("%d", "hi") // ERROR "arg .hi. for printf verb %d of wrong type: string"
+ Logf("%d", "hi") // ERROR "Logf format %d has arg \x22hi\x22 of wrong type string"
Errorf(1, "%d", 3) // OK
- Errorf(1, "%d", "hi") // ERROR "arg .hi. for printf verb %d of wrong type: string"
+ Errorf(1, "%d", "hi") // ERROR "Errorf format %d has arg \x22hi\x22 of wrong type string"
// Multiple string arguments before variadic args
errorf("WARNING", "foobar") // OK
errorf("INFO", "s=%s, n=%d", "foo", 1) // OK
- errorf("ERROR", "%d") // ERROR "format reads arg 1, have only 0 args"
+ errorf("ERROR", "%d") // ERROR "errorf format %d reads arg #1, but have only 0 args"
// Printf from external package
externalprintf.Printf("%d", 42) // OK
@@ -245,7 +245,7 @@
level := 123
externalprintf.Logf(level, "%d", 42) // OK
externalprintf.Errorf(level, level, "foo %q bar", "foobar") // OK
- externalprintf.Logf(level, "%d") // ERROR "format reads arg 1, have only 0 args"
+ externalprintf.Logf(level, "%d") // ERROR "Logf format %d reads arg #1, but have only 0 args"
var formatStr = "%s %s"
externalprintf.Sprintf(formatStr, "a", "b") // OK
externalprintf.Logf(level, formatStr, "a", "b") // OK
@@ -256,19 +256,24 @@
ss.Error(someFunction, someFunction) // OK
ss.Println() // OK
ss.Println(1.234, "foo") // OK
- ss.Println(1, someFunction) // ERROR "arg someFunction in Println call is a function value, not a function call"
+ ss.Println(1, someFunction) // ERROR "Println arg someFunction is a func value, not called"
ss.log(someFunction) // OK
ss.log(someFunction, "bar", 1.33) // OK
- ss.log(someFunction, someFunction) // ERROR "arg someFunction in log call is a function value, not a function call"
+ ss.log(someFunction, someFunction) // ERROR "log arg someFunction is a func value, not called"
// indexed arguments
- Printf("%d %[3]d %d %[2]d", 1, 2, 3, 4) // OK
- Printf("%d %[0]d %d %[2]d", 1, 2, 3, 4) // ERROR "indexes start at 1"
- Printf("%d %[3]d %d %[-2]d", 1, 2, 3, 4) // ERROR "bad syntax for printf argument index: \[-2\]"
- Printf("%d %[3]d %d %[2234234234234]d", 1, 2, 3, 4) // ERROR "bad syntax for printf argument index: .+ value out of range"
- Printf("%d %[3]d %d %[2]d", 1, 2, 3) // ERROR "format reads arg 4, have only 3 args"
- Printf("%d %[3]d %d %[2]d", 1, 2, 3, 4, 5) // ERROR "wrong number of args for format in Printf call: 4 needed but 5 args"
- Printf("%[1][3]d", 1, 2) // ERROR "unrecognized printf verb '\['"
+ Printf("%d %[3]d %d %[2]d x", 1, 2, 3, 4) // OK
+ Printf("%d %[0]d %d %[2]d x", 1, 2, 3, 4) // ERROR "Printf format has invalid argument index \[0\]"
+ Printf("%d %[3]d %d %[-2]d x", 1, 2, 3, 4) // ERROR "Printf format has invalid argument index \[-2\]"
+ Printf("%d %[3]d %d %[2234234234234]d x", 1, 2, 3, 4) // ERROR "Printf format has invalid argument index \[2234234234234\]"
+ Printf("%d %[3]d %-10d %[2]d x", 1, 2, 3) // ERROR "Printf format %-10d reads arg #4, but have only 3 args"
+ Printf("%d %[3]d %d %[2]d x", 1, 2, 3, 4, 5) // ERROR "Printf call needs 4 args but has 5 args"
+ Printf("%[1][3]d x", 1, 2) // ERROR "Printf format %\[1\]\[ has unknown verb \["
+
+ // wrote Println but meant Fprintln
+ Printf("%p\n", os.Stdout) // OK
+ Println(os.Stdout, "hello") // ERROR "Println does not take io.Writer but has first arg os.Stdout"
+
}
type someStruct struct{}
@@ -414,17 +419,17 @@
func (s recursiveStringer) String() string {
_ = fmt.Sprintf("%d", s)
_ = fmt.Sprintf("%#v", s)
- _ = fmt.Sprintf("%v", s) // ERROR "arg s for printf causes recursive call to String method"
- _ = fmt.Sprintf("%v", &s) // ERROR "arg &s for printf causes recursive call to String method"
+ _ = fmt.Sprintf("%v", s) // ERROR "Sprintf format %v with arg s causes recursive String method call"
+ _ = fmt.Sprintf("%v", &s) // ERROR "Sprintf format %v with arg &s causes recursive String method call"
_ = fmt.Sprintf("%T", s) // ok; does not recursively call String
- return fmt.Sprintln(s) // ERROR "arg s in Sprintln call causes recursive call to String method"
+ return fmt.Sprintln(s) // ERROR "Sprintln arg s causes recursive call to String method"
}
type recursivePtrStringer int
func (p *recursivePtrStringer) String() string {
_ = fmt.Sprintf("%v", *p)
- return fmt.Sprintln(p) // ERROR "arg p in Sprintln call causes recursive call to String method"
+ return fmt.Sprintln(p) // ERROR "Sprintln arg p causes recursive call to String method"
}
type Formatter bool
@@ -500,27 +505,27 @@
func UnexportedStringerOrError() {
us := unexportedStringer{}
- fmt.Printf("%s", us) // ERROR "arg us for printf verb %s of wrong type"
- fmt.Printf("%s", &us) // ERROR "arg &us for printf verb %s of wrong type"
+ fmt.Printf("%s", us) // ERROR "Printf format %s has arg us of wrong type testdata.unexportedStringer"
+ fmt.Printf("%s", &us) // ERROR "Printf format %s has arg &us of wrong type [*]testdata.unexportedStringer"
usf := unexportedStringerOtherFields{
s: "foo",
S: "bar",
}
- fmt.Printf("%s", usf) // ERROR "arg usf for printf verb %s of wrong type"
- fmt.Printf("%s", &usf) // ERROR "arg &usf for printf verb %s of wrong type"
+ fmt.Printf("%s", usf) // ERROR "Printf format %s has arg usf of wrong type testdata.unexportedStringerOtherFields"
+ fmt.Printf("%s", &usf) // ERROR "Printf format %s has arg &usf of wrong type [*]testdata.unexportedStringerOtherFields"
ue := unexportedError{
e: &errorer{},
}
- fmt.Printf("%s", ue) // ERROR "arg ue for printf verb %s of wrong type"
- fmt.Printf("%s", &ue) // ERROR "arg &ue for printf verb %s of wrong type"
+ fmt.Printf("%s", ue) // ERROR "Printf format %s has arg ue of wrong type testdata.unexportedError"
+ fmt.Printf("%s", &ue) // ERROR "Printf format %s has arg &ue of wrong type [*]testdata.unexportedError"
uef := unexportedErrorOtherFields{
s: "foo",
e: &errorer{},
S: "bar",
}
- fmt.Printf("%s", uef) // ERROR "arg uef for printf verb %s of wrong type"
- fmt.Printf("%s", &uef) // ERROR "arg &uef for printf verb %s of wrong type"
+ fmt.Printf("%s", uef) // ERROR "Printf format %s has arg uef of wrong type testdata.unexportedErrorOtherFields"
+ fmt.Printf("%s", &uef) // ERROR "Printf format %s has arg &uef of wrong type [*]testdata.unexportedErrorOtherFields"
}
diff --git a/src/cmd/vet/testdata/shift.go b/src/cmd/vet/testdata/shift.go
index 50a042e..73cbaf8 100644
--- a/src/cmd/vet/testdata/shift.go
+++ b/src/cmd/vet/testdata/shift.go
@@ -6,7 +6,10 @@
package testdata
-import "unsafe"
+import (
+ "fmt"
+ "unsafe"
+)
func ShiftTest() {
var i8 int8
@@ -154,6 +157,6 @@
// Make sure other vet checks work in dead code.
if iBits == 1024 {
_ = i << 512 // OK
- fmt.Printf("foo %s bar", 123) // ERROR "arg 123 for printf verb %s of wrong type: untyped int"
+ fmt.Printf("foo %s bar", 123) // ERROR "Printf"
}
}
To view, visit change 74352. To unsubscribe, or for help writing mail filters, visit settings.
Gobot Gobot (Gerrit)
Oct 30, 2017, 11:31:55 AM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
TryBots beginning. Status page: https://farmer.golang.org/try?commit=36249ba9
Gobot Gobot (Gerrit)
Oct 30, 2017, 11:37:07 AM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Build is still in progress...
This change failed on misc-vet-vetall:
See https://storage.googleapis.com/go-build-log/36249ba9/misc-vet-vetall_d16e9390.log
Consult https://build.golang.org/ to see whether it's a new failure. Other builds still in progress; subsequent failure notices suppressed until final report.
Gobot Gobot (Gerrit)
Oct 30, 2017, 11:51:36 AM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
12 of 21 TryBots failed:
Failed on misc-vet-vetall: https://storage.googleapis.com/go-build-log/36249ba9/misc-vet-vetall_d16e9390.log
Failed on darwin-amd64-10_11: https://storage.googleapis.com/go-build-log/36249ba9/darwin-amd64-10_11_1a413969.log
Failed on freebsd-amd64-110: https://storage.googleapis.com/go-build-log/36249ba9/freebsd-amd64-110_8cc5c922.log
Failed on windows-386-2008: https://storage.googleapis.com/go-build-log/36249ba9/windows-386-2008_cc4badda.log
Failed on linux-amd64: https://storage.googleapis.com/go-build-log/36249ba9/linux-amd64_e5da5010.log
Failed on nacl-amd64p32: https://storage.googleapis.com/go-build-log/36249ba9/nacl-amd64p32_2bf305a0.log
Failed on nacl-386: https://storage.googleapis.com/go-build-log/36249ba9/nacl-386_897b4723.log
Failed on windows-amd64-2016: https://storage.googleapis.com/go-build-log/36249ba9/windows-amd64-2016_b9750901.log
Failed on linux-386: https://storage.googleapis.com/go-build-log/36249ba9/linux-386_167833ca.log
Failed on linux-amd64-ssacheck: https://storage.googleapis.com/go-build-log/36249ba9/linux-amd64-ssacheck_7e66c6e5.log
Failed on openbsd-amd64-60: https://storage.googleapis.com/go-build-log/36249ba9/openbsd-amd64-60_2c6eb85d.log
Failed on linux-arm: https://storage.googleapis.com/go-build-log/36249ba9/linux-arm_8d36ecf8.log
Consult https://build.golang.org/ to see whether they are new failures.
Patch set 1:TryBot-Result -1
Rob Pike (Gerrit)
Oct 30, 2017, 4:51:05 PM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, Rob Pike, Gobot Gobot, golang-co...@googlegroups.com
2 comments:
Patch Set #1, Line 601:
f.Badf(call.Pos(), "%s format %s reads arg #%d, but have only %d args", state.name, state.format, arg, len(call.Args)-state.firstArg)s/have/has/
Patch Set #1, Line 608:
var printFormatRE = regexp.MustCompile(`%[+\-#]*([0-9]+|(\[\d+\])?\*)?\.?([0-9]+|(\[\d+\])?\*)?(\[\d+\])?[a-zA-Z%]`)it's sometimes [0-9] and sometimes \d. be consistent. if they're different for a reason, please explain because i might be confused. this is a monster.
p.s. i had to look up \d but i suspect most wouldn't.
p.p.s. it takes longer than expected to figure out what \d means by reading golang.org.pkg/regexp/syntax.
p.p.p.s. when writing a huge regexp like this, i like to break it into manageable named pieces and assemble them with + if that is possible and worthwhile. i don't know if either is true here.
To view, visit change 74352. To unsubscribe, or for help writing mail filters, visit settings.
Russ Cox (Gerrit)
Oct 30, 2017, 10:37:24 PM10/30/17
to Russ Cox, Gobot Gobot, goph...@pubsubhelper.golang.org, Rob Pike, golang-co...@googlegroups.com
Russ Cox uploaded patch set #2 to this change.
3 files changed, 168 insertions(+), 134 deletions(-)
To view, visit change 74352. To unsubscribe, or for help writing mail filters, visit settings.
Gobot Gobot (Gerrit)
Oct 30, 2017, 10:37:41 PM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, Rob Pike, golang-co...@googlegroups.com
TryBots beginning. Status page: https://farmer.golang.org/try?commit=300a7083
Russ Cox (Gerrit)
Oct 30, 2017, 10:38:05 PM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, Rob Pike, Gobot Gobot, Rob Pike, golang-co...@googlegroups.com
This should now be ready for review. I've split it out from the giant CL stack it used to be in.
2 comments:
Patch Set #1, Line 601:
arg := argNum - state.firstArg + 1 // People think of arguments as 1-indexed.s/have/has/
did s/have/call has/
Patch Set #1, Line 608:
// We exclude the space flag, so that printing a string like "x % y" is not reported as a format.it's sometimes [0-9] and sometimes \d. be consistent. […]
Done. I usually try to use [0-9] for simplicity but \[\d+\] seemed clearer than the different bracket meanings in \[[0-9]+\]. I broke it up and used [0-9] throughout.
To view, visit change 74352. To unsubscribe, or for help writing mail filters, visit settings.
Gobot Gobot (Gerrit)
Oct 30, 2017, 10:39:10 PM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, Rob Pike, Rob Pike, golang-co...@googlegroups.com
Build is still in progress...
This change failed on misc-vet-vetall:
See https://storage.googleapis.com/go-build-log/300a7083/misc-vet-vetall_71d88625.log
Consult https://build.golang.org/ to see whether it's a new failure. Other builds still in progress; subsequent failure notices suppressed until final report.
To view, visit change 74352. To unsubscribe, or for help writing mail filters, visit settings.
Russ Cox (Gerrit)
Oct 30, 2017, 10:43:46 PM10/30/17
to Russ Cox, Gobot Gobot, Rob Pike, goph...@pubsubhelper.golang.org, Rob Pike, golang-co...@googlegroups.com
Russ Cox uploaded patch set #3 to this change.
M src/cmd/go/go_test.go
M src/cmd/vet/print.go
M src/cmd/vet/testdata/print.go
M src/cmd/vet/testdata/shift.go
4 files changed, 171 insertions(+), 137 deletions(-)
To view, visit change 74352. To unsubscribe, or for help writing mail filters, visit settings.
Gobot Gobot (Gerrit)
Oct 30, 2017, 10:44:01 PM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, Rob Pike, Rob Pike, golang-co...@googlegroups.com
TryBots beginning. Status page: https://farmer.golang.org/try?commit=bd275c53
Gobot Gobot (Gerrit)
Oct 30, 2017, 10:45:42 PM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, Rob Pike, Rob Pike, golang-co...@googlegroups.com
Build is still in progress...
This change failed on misc-vet-vetall:
See https://storage.googleapis.com/go-build-log/bd275c53/misc-vet-vetall_4de665ad.log
Consult https://build.golang.org/ to see whether it's a new failure. Other builds still in progress; subsequent failure notices suppressed until final report.
To view, visit change 74352. To unsubscribe, or for help writing mail filters, visit settings.
Rob Pike (Gerrit)
Oct 30, 2017, 10:47:06 PM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, Rob Pike, Gobot Gobot, Rob Pike, golang-co...@googlegroups.com
Patch set 3:Code-Review +2
1 comment:
That is SO MUCH more readable!
To view, visit change 74352. To unsubscribe, or for help writing mail filters, visit settings.
Gobot Gobot (Gerrit)
Oct 30, 2017, 10:47:20 PM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, Rob Pike, Rob Pike, golang-co...@googlegroups.com
8 of 21 TryBots failed:
Failed on misc-vet-vetall: https://storage.googleapis.com/go-build-log/300a7083/misc-vet-vetall_71d88625.log
Failed on linux-amd64: https://storage.googleapis.com/go-build-log/300a7083/linux-amd64_0bd25db4.log
Failed on darwin-amd64-10_11: https://storage.googleapis.com/go-build-log/300a7083/darwin-amd64-10_11_31a9ad3c.log
Failed on linux-386: https://storage.googleapis.com/go-build-log/300a7083/linux-386_b77eb560.log
Failed on windows-386-2008: https://storage.googleapis.com/go-build-log/300a7083/windows-386-2008_04135868.log
Failed on freebsd-amd64-110: https://storage.googleapis.com/go-build-log/300a7083/freebsd-amd64-110_199616bb.log
Failed on openbsd-amd64-60: https://storage.googleapis.com/go-build-log/300a7083/openbsd-amd64-60_2ee46f7b.log
Failed on windows-amd64-2016: https://storage.googleapis.com/go-build-log/300a7083/windows-amd64-2016_975e7a4a.log
Consult https://build.golang.org/ to see whether they are new failures.
Patch set 2:TryBot-Result -1
Gobot Gobot (Gerrit)
Oct 30, 2017, 10:54:06 PM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, Rob Pike, Rob Pike, golang-co...@googlegroups.com
1 of 21 TryBots failed:
Failed on misc-vet-vetall: https://storage.googleapis.com/go-build-log/bd275c53/misc-vet-vetall_4de665ad.log
Consult https://build.golang.org/ to see whether they are new failures.
Patch set 3:TryBot-Result -1
Ian Lance Taylor (Gerrit)
Oct 30, 2017, 11:13:59 PM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, Gobot Gobot, Rob Pike, Rob Pike, golang-co...@googlegroups.com
Needs an update to cmd/vet/whitelist/all/all.txt.
Gobot Gobot (Gerrit)
Oct 30, 2017, 11:20:29 PM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, Ian Lance Taylor, Rob Pike, Rob Pike, golang-co...@googlegroups.com
TryBots beginning. Status page: https://farmer.golang.org/try?commit=481be13d
Russ Cox (Gerrit)
Oct 30, 2017, 11:20:32 PM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, Gobot Gobot, Ian Lance Taylor, Rob Pike, Rob Pike, golang-co...@googlegroups.com
Patch Set 3:
Needs an update to cmd/vet/whitelist/all/all.txt.
Thanks. New CL 74590 below this one should take care of this.
Gobot Gobot (Gerrit)
Oct 30, 2017, 11:22:17 PM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, Ian Lance Taylor, Rob Pike, Rob Pike, golang-co...@googlegroups.com
Build is still in progress...
This change failed on misc-vet-vetall:
See https://storage.googleapis.com/go-build-log/481be13d/misc-vet-vetall_78f5fcc1.log
Consult https://build.golang.org/ to see whether it's a new failure. Other builds still in progress; subsequent failure notices suppressed until final report.
To view, visit change 74352. To unsubscribe, or for help writing mail filters, visit settings.
Gobot Gobot (Gerrit)
Oct 30, 2017, 11:30:10 PM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, Ian Lance Taylor, Rob Pike, Rob Pike, golang-co...@googlegroups.com
Build is still in progress...
This change failed on darwin-amd64-10_11:
See https://storage.googleapis.com/go-build-log/481be13d/darwin-amd64-10_11_cdb74c6a.log
Consult https://build.golang.org/ to see whether it's a new failure. Other builds still in progress; subsequent failure notices suppressed until final report.
To view, visit change 74352. To unsubscribe, or for help writing mail filters, visit settings.
Russ Cox (Gerrit)
Oct 30, 2017, 11:33:29 PM10/30/17
to Russ Cox, Rob Pike, Gobot Gobot, Rob Pike, goph...@pubsubhelper.golang.org, Ian Lance Taylor, golang-co...@googlegroups.com
Russ Cox uploaded patch set #5 to this change.
M src/cmd/dist/test.go
M src/cmd/go/go_test.go
M src/cmd/vet/print.go
M src/cmd/vet/testdata/print.go
M src/cmd/vet/testdata/shift.go
5 files changed, 173 insertions(+), 138 deletions(-)
To view, visit change 74352. To unsubscribe, or for help writing mail filters, visit settings.
Gobot Gobot (Gerrit)
Oct 30, 2017, 11:33:44 PM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, Ian Lance Taylor, Rob Pike, Rob Pike, golang-co...@googlegroups.com
TryBots beginning. Status page: https://farmer.golang.org/try?commit=509647e0
Gobot Gobot (Gerrit)
Oct 30, 2017, 11:37:18 PM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, Ian Lance Taylor, Rob Pike, Rob Pike, golang-co...@googlegroups.com
Build is still in progress...
This change failed on misc-vet-vetall:
See https://storage.googleapis.com/go-build-log/509647e0/misc-vet-vetall_f0f5bfb0.log
Consult https://build.golang.org/ to see whether it's a new failure. Other builds still in progress; subsequent failure notices suppressed until final report.
To view, visit change 74352. To unsubscribe, or for help writing mail filters, visit settings.
Gobot Gobot (Gerrit)
Oct 30, 2017, 11:44:29 PM10/30/17
to Russ Cox, goph...@pubsubhelper.golang.org, Ian Lance Taylor, Rob Pike, Rob Pike, golang-co...@googlegroups.com
1 of 21 TryBots failed:
Failed on misc-vet-vetall: https://storage.googleapis.com/go-build-log/509647e0/misc-vet-vetall_f0f5bfb0.log
Consult https://build.golang.org/ to see whether they are new failures.
Patch set 5:TryBot-Result -1
Gobot Gobot (Gerrit)
Oct 31, 2017, 9:55:25 AM10/31/17
to Russ Cox, goph...@pubsubhelper.golang.org, Ian Lance Taylor, Rob Pike, Rob Pike, golang-co...@googlegroups.com
TryBots beginning. Status page: https://farmer.golang.org/try?commit=f437b04f
Gobot Gobot (Gerrit)
Oct 31, 2017, 10:03:03 AM10/31/17
to Russ Cox, goph...@pubsubhelper.golang.org, Ian Lance Taylor, Rob Pike, Rob Pike, golang-co...@googlegroups.com
Build is still in progress...
This change failed on misc-vet-vetall:
See https://storage.googleapis.com/go-build-log/f437b04f/misc-vet-vetall_d6ba9c74.log
Consult https://build.golang.org/ to see whether it's a new failure. Other builds still in progress; subsequent failure notices suppressed until final report.
To view, visit change 74352. To unsubscribe, or for help writing mail filters, visit settings.
Russ Cox (Gerrit)
Oct 31, 2017, 10:12:35 AM10/31/17
to Russ Cox, goph...@pubsubhelper.golang.org, Gobot Gobot, Ian Lance Taylor, Rob Pike, Rob Pike, golang-co...@googlegroups.com
Not particularly enamored of the vetall whitelist at the moment.
Russ Cox (Gerrit)
Oct 31, 2017, 10:14:06 AM10/31/17
to Russ Cox, Rob Pike, Gobot Gobot, Rob Pike, goph...@pubsubhelper.golang.org, Ian Lance Taylor, golang-co...@googlegroups.com
Russ Cox uploaded patch set #7 to this change.
M src/cmd/vet/all/whitelist/windows.txt
M src/cmd/vet/print.go
M src/cmd/vet/testdata/print.go
M src/cmd/vet/testdata/shift.go
6 files changed, 173 insertions(+), 140 deletions(-)
To view, visit change 74352. To unsubscribe, or for help writing mail filters, visit settings.
Gobot Gobot (Gerrit)
Oct 31, 2017, 10:14:20 AM10/31/17
to Russ Cox, goph...@pubsubhelper.golang.org, Ian Lance Taylor, Rob Pike, Rob Pike, golang-co...@googlegroups.com
TryBots beginning. Status page: https://farmer.golang.org/try?commit=494f1c4d
Gobot Gobot (Gerrit)
Oct 31, 2017, 10:16:17 AM10/31/17
to Russ Cox, goph...@pubsubhelper.golang.org, Ian Lance Taylor, Rob Pike, Rob Pike, golang-co...@googlegroups.com
Build is still in progress...
This change failed on misc-vet-vetall:
See https://storage.googleapis.com/go-build-log/f437b04f/misc-vet-vetall_c9afdcd5.log
Consult https://build.golang.org/ to see whether it's a new failure. Other builds still in progress; subsequent failure notices suppressed until final report.
Gobot Gobot (Gerrit)
Oct 31, 2017, 10:38:39 AM10/31/17
to Russ Cox, goph...@pubsubhelper.golang.org, Ian Lance Taylor, Rob Pike, Rob Pike, golang-co...@googlegroups.com
TryBots are happy.
Patch set 7:TryBot-Result +1
Russ Cox (Gerrit)
Oct 31, 2017, 12:25:39 PM10/31/17
to Russ Cox, goph...@pubsubhelper.golang.org, golang-...@googlegroups.com, Gobot Gobot, Ian Lance Taylor, Rob Pike, Rob Pike, golang-co...@googlegroups.com
Russ Cox merged this change.
Approvals:
Rob Pike: Looks good to me, approved
Russ Cox: Run TryBots
Gobot Gobot: TryBots succeeded
Reviewed-on: https://go-review.googlesource.com/74352
Run-TryBot: Russ Cox <r...@golang.org>
TryBot-Result: Gobot Gobot <go...@golang.org>
Reviewed-by: Rob Pike <r...@golang.org>
---
M src/cmd/dist/test.go
M src/cmd/go/go_test.go
M src/cmd/vet/all/whitelist/windows.txt
M src/cmd/vet/print.go
M src/cmd/vet/testdata/print.go
M src/cmd/vet/testdata/shift.go
6 files changed, 173 insertions(+), 140 deletions(-)
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index 5cb0ee5..72d0277 100644
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -343,7 +343,7 @@
osarch := k
t.tests = append(t.tests, distTest{
name: "vet/" + osarch,
- heading: "go vet std cmd",
+ heading: "cmd/vet/all",
fn: func(dt *distTest) error {
t.addCmd(dt, "src/cmd/vet/all", "go", "run", "main.go", "-p="+osarch)
return nil
diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go
index 152b276..56a3c9c 100644
--- a/src/cmd/go/go_test.go
+++ b/src/cmd/go/go_test.go
@@ -2909,7 +2909,7 @@
tg.run("install", "cmd/vet")
tg.setenv("GOPATH", filepath.Join(tg.pwd(), "testdata"))
tg.runFail("vet", "vetpkg")
- tg.grepBoth("missing argument for Printf", "go vet vetpkg did not find missing argument for Printf")
+ tg.grepBoth("Printf", "go vet vetpkg did not find missing argument for Printf")
}
func TestGoVetWithTags(t *testing.T) {
@@ -2919,7 +2919,7 @@
tg.run("install", "cmd/vet")
tg.setenv("GOPATH", filepath.Join(tg.pwd(), "testdata"))
tg.runFail("vet", "-tags", "tagtest", "vetpkg")
- tg.grepBoth(`c\.go.*wrong number of args for format`, "go vet vetpkg did not run scan tagged file")
+ tg.grepBoth(`c\.go.*Printf`, "go vet vetpkg did not run scan tagged file")
}
func TestGoVetWithFlagsOn(t *testing.T) {
@@ -2929,7 +2929,7 @@
tg.run("install", "cmd/vet")
tg.setenv("GOPATH", filepath.Join(tg.pwd(), "testdata"))
tg.runFail("vet", "-printf", "vetpkg")
- tg.grepBoth("missing argument for Printf", "go vet -printf vetpkg did not find missing argument for Printf")
+ tg.grepBoth("Printf", "go vet -printf vetpkg did not find missing argument for Printf")
}
func TestGoVetWithFlagsOff(t *testing.T) {
diff --git a/src/cmd/vet/all/whitelist/windows.txt b/src/cmd/vet/all/whitelist/windows.txt
index 1a208ad..2c101ae 100644
--- a/src/cmd/vet/all/whitelist/windows.txt
+++ b/src/cmd/vet/all/whitelist/windows.txt
@@ -3,7 +3,5 @@
// Issue 18609
crypto/x509/root_windows.go: unreachable code
-path/filepath/path_windows_test.go: possible formatting directive in Fatal call
-
runtime/sys_windows_ARCHSUFF.s: [GOARCH] sigtramp: function sigtramp missing Go declaration
runtime/sys_windows_ARCHSUFF.s: [GOARCH] onosstack: unknown variable usec; offset 0 is fn+0(FP)
diff --git a/src/cmd/vet/print.go b/src/cmd/vet/print.go
index 21bb0d0..620075d 100644
--- a/src/cmd/vet/print.go
+++ b/src/cmd/vet/print.go
@@ -9,10 +9,12 @@
import (
"bytes"
"flag"
+ "fmt"
"go/ast"
"go/constant"
"go/token"
"go/types"
+ "regexp"
"strconv"
"strings"
"unicode/utf8"
@@ -88,8 +90,8 @@
// The first string literal or string constant is assumed to be a format string
// if the call's signature cannot be determined.
//
-// If it cannot find any format string parameter, it returns ("", -1).
-func formatString(f *File, call *ast.CallExpr) (string, int) {
+// If it cannot find any format string parameter, it returns ("", -1).
+func formatString(f *File, call *ast.CallExpr) (format string, idx int) {
typ := f.pkg.types[call.Fun].Type
if typ != nil {
if sig, ok := typ.(*types.Signature); ok {
@@ -228,7 +230,7 @@
firstArg := idx + 1 // Arguments are immediately after format string.
if !strings.Contains(format, "%") {
if len(call.Args) > firstArg {
- f.Badf(call.Pos(), "no formatting directive in %s call", name)
+ f.Badf(call.Pos(), "%s call has arguments but no formatting directives", name)
}
return
}
@@ -266,7 +268,7 @@
if maxArgNum != len(call.Args) {
expect := maxArgNum - firstArg
numArgs := len(call.Args) - firstArg
- f.Badf(call.Pos(), "wrong number of args for format in %s call: %d needed but %d args", name, expect, numArgs)
+ f.Badf(call.Pos(), "%s call needs %v but has %v", name, count(expect, "arg"), count(numArgs, "arg"))
}
}
@@ -302,17 +304,18 @@
s.nbytes++ // skip '['
start := s.nbytes
s.scanNum()
+ ok := true
if s.nbytes == len(s.format) || s.nbytes == start || s.format[s.nbytes] != ']' {
- end := strings.Index(s.format, "]")
- if end < 0 {
- end = len(s.format)
+ ok = false
+ s.nbytes = strings.Index(s.format, "]")
+ if s.nbytes < 0 {
+ s.file.Badf(s.call.Pos(), "%s format %s is missing closing ]", s.name, s.format)
+ return false
}
- s.file.Badf(s.call.Pos(), "bad syntax for printf argument index: [%s]", s.format[start:end])
- return false
}
arg32, err := strconv.ParseInt(s.format[start:s.nbytes], 10, 32)
- if err != nil {
- s.file.Badf(s.call.Pos(), "bad syntax for printf argument index: %s", err)
+ if err != nil || !ok || arg32 <= 0 || arg32 > int64(len(s.call.Args)-s.firstArg) {
+ s.file.Badf(s.call.Pos(), "%s format has invalid argument index [%s]", s.name, s.format[start:s.nbytes])
return false
}
s.nbytes++ // skip ']'
@@ -388,7 +391,7 @@
return nil
}
if state.nbytes == len(state.format) {
- f.Badf(call.Pos(), "missing verb at end of format string in %s call", name)
+ f.Badf(call.Pos(), "%s format %s is missing verb at end of string", name, state.format)
return nil
}
verb, w := utf8.DecodeRuneInString(state.format[state.nbytes:])
@@ -481,12 +484,12 @@
}
if !found && !formatter {
- f.Badf(call.Pos(), "unrecognized printf verb %q", state.verb)
+ f.Badf(call.Pos(), "%s format %s has unknown verb %c", state.name, state.format, state.verb)
return false
}
for _, flag := range state.flags {
if !strings.ContainsRune(v.flags, rune(flag)) {
- f.Badf(call.Pos(), "unrecognized printf flag for verb %q: %q", state.verb, flag)
+ f.Badf(call.Pos(), "%s format %s has unrecognized flag %c", state.name, state.format, flag)
return false
}
}
@@ -504,7 +507,7 @@
}
arg := call.Args[argNum]
if !f.matchArgType(argInt, nil, arg) {
- f.Badf(call.Pos(), "arg %s for * in printf format not of type int", f.gofmt(arg))
+ f.Badf(call.Pos(), "%s format %s uses non-int %s as argument of *", state.name, state.format, f.gofmt(arg))
return false
}
}
@@ -517,7 +520,7 @@
}
arg := call.Args[argNum]
if f.isFunctionValue(arg) && state.verb != 'p' && state.verb != 'T' {
- f.Badf(call.Pos(), "arg %s in printf call is a function value, not a function call", f.gofmt(arg))
+ f.Badf(call.Pos(), "%s format %s arg %s is a func value, not called", state.name, state.format, f.gofmt(arg))
return false
}
if !f.matchArgType(v.typ, nil, arg) {
@@ -525,11 +528,11 @@
if typ := f.pkg.types[arg].Type; typ != nil {
typeString = typ.String()
}
- f.Badf(call.Pos(), "arg %s for printf verb %%%c of wrong type: %s", f.gofmt(arg), state.verb, typeString)
+ f.Badf(call.Pos(), "%s format %s has arg %s of wrong type %s", state.name, state.format, f.gofmt(arg), typeString)
return false
}
if v.typ&argString != 0 && v.verb != 'T' && !bytes.Contains(state.flags, []byte{'#'}) && f.recursiveStringer(arg) {
- f.Badf(call.Pos(), "arg %s for printf causes recursive call to String method", f.gofmt(arg))
+ f.Badf(call.Pos(), "%s format %s with arg %s causes recursive String method call", state.name, state.format, f.gofmt(arg))
return false
}
return true
@@ -580,14 +583,10 @@
// means we can't see it.
func (f *File) argCanBeChecked(call *ast.CallExpr, formatArg int, state *formatState) bool {
argNum := state.argNums[formatArg]
- if argNum < 0 {
+ if argNum <= 0 {
// Shouldn't happen, so catch it with prejudice.
panic("negative arg num")
}
- if argNum == 0 {
- f.Badf(call.Pos(), `index value [0] for %s("%s"); indexes start at 1`, state.name, state.format)
- return false
- }
if argNum < len(call.Args)-1 {
return true // Always OK.
}
@@ -600,10 +599,22 @@
// There are bad indexes in the format or there are fewer arguments than the format needs.
// This is the argument number relative to the format: Printf("%s", "hi") will give 1 for the "hi".
arg := argNum - state.firstArg + 1 // People think of arguments as 1-indexed.
- f.Badf(call.Pos(), `missing argument for %s("%s"): format reads arg %d, have only %d args`, state.name, state.format, arg, len(call.Args)-state.firstArg)
+ f.Badf(call.Pos(), "%s format %s reads arg #%d, but call has only %v", state.name, state.format, arg, count(len(call.Args)-state.firstArg, "arg"))
return false
}
+// printFormatRE is the regexp we match and report as a possible format string
+// in the first argument to unformatted prints like fmt.Print.
+// We exclude the space flag, so that printing a string like "x % y" is not reported as a format.
+var printFormatRE = regexp.MustCompile(`%` + flagsRE + numOptRE + `\.?` + numOptRE + indexOptRE + verbRE)
+
+const (
+ flagsRE = `[+\-#]*`
+ indexOptRE = `(\[[0-9]+\])?`
+ numOptRE = `([0-9]+|` + indexOptRE + `\*)?`
+ verbRE = `[bcdefgopqstxEFGUX]`
+)
+
// checkPrint checks a call to an unformatted print routine such as Println.
func (f *File) checkPrint(call *ast.CallExpr, name string) {
firstArg := 0
@@ -635,23 +646,26 @@
}
args = args[firstArg:]
- // check for Println(os.Stderr, ...)
if firstArg == 0 {
- if sel, ok := args[0].(*ast.SelectorExpr); ok {
+ if sel, ok := call.Args[0].(*ast.SelectorExpr); ok {
if x, ok := sel.X.(*ast.Ident); ok {
if x.Name == "os" && strings.HasPrefix(sel.Sel.Name, "Std") {
- f.Badf(call.Pos(), "first argument to %s is %s.%s", name, x.Name, sel.Sel.Name)
+ f.Badf(call.Pos(), "%s does not take io.Writer but has first arg %s", name, f.gofmt(call.Args[0]))
}
}
}
}
+
arg := args[0]
if lit, ok := arg.(*ast.BasicLit); ok && lit.Kind == token.STRING {
// Ignore trailing % character in lit.Value.
// The % in "abc 0.0%" couldn't be a formatting directive.
s := strings.TrimSuffix(lit.Value, `%"`)
if strings.Contains(s, "%") {
- f.Badf(call.Pos(), "possible formatting directive in %s call", name)
+ m := printFormatRE.FindStringSubmatch(s)
+ if m != nil {
+ f.Badf(call.Pos(), "%s call has possible formatting directive %s", name, m[0])
+ }
}
}
if strings.HasSuffix(name, "ln") {
@@ -659,16 +673,25 @@
arg = args[len(args)-1]
if lit, ok := arg.(*ast.BasicLit); ok && lit.Kind == token.STRING {
if strings.HasSuffix(lit.Value, `\n"`) {
- f.Badf(call.Pos(), "%s call ends with newline", name)
+ f.Badf(call.Pos(), "%s args end with redundant newline", name)
}
}
}
for _, arg := range args {
if f.isFunctionValue(arg) {
- f.Badf(call.Pos(), "arg %s in %s call is a function value, not a function call", f.gofmt(arg), name)
+ f.Badf(call.Pos(), "%s arg %s is a func value, not called", name, f.gofmt(arg))
}
if f.recursiveStringer(arg) {
- f.Badf(call.Pos(), "arg %s in %s call causes recursive call to String method", f.gofmt(arg), name)
+ f.Badf(call.Pos(), "%s arg %s causes recursive call to String method", name, f.gofmt(arg))
}
}
}
+
+// count(n, what) returns "1 what" or "N whats"
+// (assuming the plural of what is whats).
+func count(n int, what string) string {
+ if n == 1 {
+ return "1 " + what
+ }
+ return fmt.Sprintf("%d %ss", n, what)
+}
diff --git a/src/cmd/vet/testdata/print.go b/src/cmd/vet/testdata/print.go
index 38743b1..c3f5abe 100644
--- a/src/cmd/vet/testdata/print.go
+++ b/src/cmd/vet/testdata/print.go
@@ -104,74 +104,74 @@
fmt.Printf("%g", 1+2i)
fmt.Printf("%#e %#E %#f %#F %#g %#G", 1.2, 1.2, 1.2, 1.2, 1.2, 1.2) // OK since Go 1.9
// Some bad format/argTypes
- fmt.Printf("%b", "hi") // ERROR "arg .hi. for printf verb %b of wrong type"
- fmt.Printf("%t", c) // ERROR "arg c for printf verb %t of wrong type"
- fmt.Printf("%t", 1+2i) // ERROR "arg 1 \+ 2i for printf verb %t of wrong type"
- fmt.Printf("%c", 2.3) // ERROR "arg 2.3 for printf verb %c of wrong type"
- fmt.Printf("%d", 2.3) // ERROR "arg 2.3 for printf verb %d of wrong type"
- fmt.Printf("%e", "hi") // ERROR "arg .hi. for printf verb %e of wrong type"
- fmt.Printf("%E", true) // ERROR "arg true for printf verb %E of wrong type"
- fmt.Printf("%f", "hi") // ERROR "arg .hi. for printf verb %f of wrong type"
- fmt.Printf("%F", 'x') // ERROR "arg 'x' for printf verb %F of wrong type"
- fmt.Printf("%g", "hi") // ERROR "arg .hi. for printf verb %g of wrong type"
- fmt.Printf("%g", imap) // ERROR "arg imap for printf verb %g of wrong type"
- fmt.Printf("%G", i) // ERROR "arg i for printf verb %G of wrong type"
- fmt.Printf("%o", x) // ERROR "arg x for printf verb %o of wrong type"
- fmt.Printf("%p", 23) // ERROR "arg 23 for printf verb %p of wrong type"
- fmt.Printf("%q", x) // ERROR "arg x for printf verb %q of wrong type"
- fmt.Printf("%s", b) // ERROR "arg b for printf verb %s of wrong type"
- fmt.Printf("%s", byte(65)) // ERROR "arg byte\(65\) for printf verb %s of wrong type"
- fmt.Printf("%t", 23) // ERROR "arg 23 for printf verb %t of wrong type"
- fmt.Printf("%U", x) // ERROR "arg x for printf verb %U of wrong type"
- fmt.Printf("%x", nil) // ERROR "arg nil for printf verb %x of wrong type"
- fmt.Printf("%X", 2.3) // ERROR "arg 2.3 for printf verb %X of wrong type"
- fmt.Printf("%s", stringerv) // ERROR "arg stringerv for printf verb %s of wrong type"
- fmt.Printf("%t", stringerv) // ERROR "arg stringerv for printf verb %t of wrong type"
- fmt.Printf("%s", embeddedStringerv) // ERROR "arg embeddedStringerv for printf verb %s of wrong type"
- fmt.Printf("%t", embeddedStringerv) // ERROR "arg embeddedStringerv for printf verb %t of wrong type"
- fmt.Printf("%q", notstringerv) // ERROR "arg notstringerv for printf verb %q of wrong type"
- fmt.Printf("%t", notstringerv) // ERROR "arg notstringerv for printf verb %t of wrong type"
- fmt.Printf("%t", stringerarrayv) // ERROR "arg stringerarrayv for printf verb %t of wrong type"
- fmt.Printf("%t", notstringerarrayv) // ERROR "arg notstringerarrayv for printf verb %t of wrong type"
- fmt.Printf("%q", notstringerarrayv) // ERROR "arg notstringerarrayv for printf verb %q of wrong type"
- fmt.Printf("%d", Formatter(true)) // ERROR "arg Formatter\(true\) for printf verb %d of wrong type: testdata.Formatter"
- fmt.Printf("%z", FormatterVal(true)) // correct (the type is responsible for formatting)
- fmt.Printf("%d", FormatterVal(true)) // correct (the type is responsible for formatting)
- fmt.Printf("%s", nonemptyinterface) // correct (the type is responsible for formatting)
- fmt.Printf("%.*s %d %g", 3, "hi", 23, 'x') // ERROR "arg 'x' for printf verb %g of wrong type"
- fmt.Println() // not an error
- fmt.Println("%s", "hi") // ERROR "possible formatting directive in Println call"
- fmt.Println("0.0%") // correct (trailing % couldn't be a formatting directive)
- fmt.Printf("%s", "hi", 3) // ERROR "wrong number of args for format in Printf call"
- _ = fmt.Sprintf("%"+("s"), "hi", 3) // ERROR "wrong number of args for format in Sprintf call"
- fmt.Printf("%s%%%d", "hi", 3) // correct
- fmt.Printf("%08s", "woo") // correct
- fmt.Printf("% 8s", "woo") // correct
- fmt.Printf("%.*d", 3, 3) // correct
- fmt.Printf("%.*d", 3, 3, 3, 3) // ERROR "wrong number of args for format in Printf call.*4 args"
- fmt.Printf("%.*d", "hi", 3) // ERROR "arg .hi. for \* in printf format not of type int"
- fmt.Printf("%.*d", i, 3) // correct
- fmt.Printf("%.*d", s, 3) // ERROR "arg s for \* in printf format not of type int"
- fmt.Printf("%*%", 0.22) // ERROR "arg 0.22 for \* in printf format not of type int"
- fmt.Printf("%q %q", multi()...) // ok
- fmt.Printf("%#q", `blah`) // ok
- printf("now is the time", "buddy") // ERROR "no formatting directive"
- Printf("now is the time", "buddy") // ERROR "no formatting directive"
- Printf("hi") // ok
+ fmt.Printf("%b", "hi") // ERROR "Printf format %b has arg \x22hi\x22 of wrong type string"
+ fmt.Printf("%t", c) // ERROR "Printf format %t has arg c of wrong type complex64"
+ fmt.Printf("%t", 1+2i) // ERROR "Printf format %t has arg 1 \+ 2i of wrong type complex128"
+ fmt.Printf("%c", 2.3) // ERROR "Printf format %c has arg 2.3 of wrong type float64"
+ fmt.Printf("%d", 2.3) // ERROR "Printf format %d has arg 2.3 of wrong type float64"
+ fmt.Printf("%e", "hi") // ERROR "Printf format %e has arg \x22hi\x22 of wrong type string"
+ fmt.Printf("%E", true) // ERROR "Printf format %E has arg true of wrong type bool"
+ fmt.Printf("%f", "hi") // ERROR "Printf format %f has arg \x22hi\x22 of wrong type string"
+ fmt.Printf("%F", 'x') // ERROR "Printf format %F has arg 'x' of wrong type rune"
+ fmt.Printf("%g", "hi") // ERROR "Printf format %g has arg \x22hi\x22 of wrong type string"
+ fmt.Printf("%g", imap) // ERROR "Printf format %g has arg imap of wrong type map\[int\]int"
+ fmt.Printf("%G", i) // ERROR "Printf format %G has arg i of wrong type int"
+ fmt.Printf("%o", x) // ERROR "Printf format %o has arg x of wrong type float64"
+ fmt.Printf("%p", 23) // ERROR "Printf format %p has arg 23 of wrong type int"
+ fmt.Printf("%q", x) // ERROR "Printf format %q has arg x of wrong type float64"
+ fmt.Printf("%s", b) // ERROR "Printf format %s has arg b of wrong type bool"
+ fmt.Printf("%s", byte(65)) // ERROR "Printf format %s has arg byte\(65\) of wrong type byte"
+ fmt.Printf("%t", 23) // ERROR "Printf format %t has arg 23 of wrong type int"
+ fmt.Printf("%U", x) // ERROR "Printf format %U has arg x of wrong type float64"
+ fmt.Printf("%x", nil) // ERROR "Printf format %x has arg nil of wrong type untyped nil"
+ fmt.Printf("%X", 2.3) // ERROR "Printf format %X has arg 2.3 of wrong type float64"
+ fmt.Printf("%s", stringerv) // ERROR "Printf format %s has arg stringerv of wrong type testdata.stringer"
+ fmt.Printf("%t", stringerv) // ERROR "Printf format %t has arg stringerv of wrong type testdata.stringer"
+ fmt.Printf("%s", embeddedStringerv) // ERROR "Printf format %s has arg embeddedStringerv of wrong type testdata.embeddedStringer"
+ fmt.Printf("%t", embeddedStringerv) // ERROR "Printf format %t has arg embeddedStringerv of wrong type testdata.embeddedStringer"
+ fmt.Printf("%q", notstringerv) // ERROR "Printf format %q has arg notstringerv of wrong type testdata.notstringer"
+ fmt.Printf("%t", notstringerv) // ERROR "Printf format %t has arg notstringerv of wrong type testdata.notstringer"
+ fmt.Printf("%t", stringerarrayv) // ERROR "Printf format %t has arg stringerarrayv of wrong type testdata.stringerarray"
+ fmt.Printf("%t", notstringerarrayv) // ERROR "Printf format %t has arg notstringerarrayv of wrong type testdata.notstringerarray"
+ fmt.Printf("%q", notstringerarrayv) // ERROR "Printf format %q has arg notstringerarrayv of wrong type testdata.notstringerarray"
+ fmt.Printf("%d", Formatter(true)) // ERROR "Printf format %d has arg Formatter\(true\) of wrong type testdata.Formatter"
+ fmt.Printf("%z", FormatterVal(true)) // correct (the type is responsible for formatting)
+ fmt.Printf("%d", FormatterVal(true)) // correct (the type is responsible for formatting)
+ fmt.Printf("%s", nonemptyinterface) // correct (the type is responsible for formatting)
+ fmt.Printf("%.*s %d %6g", 3, "hi", 23, 'x') // ERROR "Printf format %6g has arg 'x' of wrong type rune"
+ fmt.Println() // not an error
+ fmt.Println("%s", "hi") // ERROR "Println call has possible formatting directive %s"
+ fmt.Println("0.0%") // correct (trailing % couldn't be a formatting directive)
+ fmt.Printf("%s", "hi", 3) // ERROR "Printf call needs 1 arg but has 2 args"
+ _ = fmt.Sprintf("%"+("s"), "hi", 3) // ERROR "Sprintf call needs 1 arg but has 2 args"
+ fmt.Printf("%s%%%d", "hi", 3) // correct
+ fmt.Printf("%08s", "woo") // correct
+ fmt.Printf("% 8s", "woo") // correct
+ fmt.Printf("%.*d", 3, 3) // correct
+ fmt.Printf("%.*d x", 3, 3, 3, 3) // ERROR "Printf call needs 2 args but has 4 args"
+ fmt.Printf("%.*d x", "hi", 3) // ERROR "Printf format %.*d uses non-int \x22hi\x22 as argument of \*"
+ fmt.Printf("%.*d x", i, 3) // correct
+ fmt.Printf("%.*d x", s, 3) // ERROR "Printf format %.\*d uses non-int s as argument of \*"
+ fmt.Printf("%*% x", 0.22) // ERROR "Printf format %\*% uses non-int 0.22 as argument of \*"
+ fmt.Printf("%q %q", multi()...) // ok
+ fmt.Printf("%#q", `blah`) // ok
+ printf("now is the time", "buddy") // ERROR "printf call has arguments but no formatting directives"
+ Printf("now is the time", "buddy") // ERROR "Printf call has arguments but no formatting directives"
+ Printf("hi") // ok
const format = "%s %s\n"
Printf(format, "hi", "there")
- Printf(format, "hi") // ERROR "missing argument for Printf..%s..: format reads arg 2, have only 1"
- Printf("%s %d %.3v %q", "str", 4) // ERROR "missing argument for Printf..%.3v..: format reads arg 3, have only 2"
+ Printf(format, "hi") // ERROR "Printf format %s reads arg #2, but call has only 1 arg$"
+ Printf("%s %d %.3v %q", "str", 4) // ERROR "Printf format %.3v reads arg #3, but call has only 2 args"
f := new(stringer)
- f.Warn(0, "%s", "hello", 3) // ERROR "possible formatting directive in Warn call"
- f.Warnf(0, "%s", "hello", 3) // ERROR "wrong number of args for format in Warnf call"
- f.Warnf(0, "%r", "hello") // ERROR "unrecognized printf verb"
- f.Warnf(0, "%#s", "hello") // ERROR "unrecognized printf flag"
- Printf("d%", 2) // ERROR "missing verb at end of format string in Printf call"
+ f.Warn(0, "%s", "hello", 3) // ERROR "Warn call has possible formatting directive %s"
+ f.Warnf(0, "%s", "hello", 3) // ERROR "Warnf call needs 1 arg but has 2 args"
+ f.Warnf(0, "%r", "hello") // ERROR "Warnf format %r has unknown verb r"
+ f.Warnf(0, "%#s", "hello") // ERROR "Warnf format %#s has unrecognized flag #"
+ Printf("d%", 2) // ERROR "Printf format % is missing verb at end of string"
Printf("%d", percentDV)
Printf("%d", &percentDV)
- Printf("%d", notPercentDV) // ERROR "arg notPercentDV for printf verb %d of wrong type"
- Printf("%d", ¬PercentDV) // ERROR "arg ¬PercentDV for printf verb %d of wrong type"
+ Printf("%d", notPercentDV) // ERROR "Printf format %d has arg notPercentDV of wrong type testdata.notPercentDStruct"
+ Printf("%d", ¬PercentDV) // ERROR "Printf format %d has arg ¬PercentDV of wrong type \*testdata.notPercentDStruct"
Printf("%p", ¬PercentDV) // Works regardless: we print it as a pointer.
Printf("%s", percentSV)
Printf("%s", &percentSV)
@@ -182,13 +182,13 @@
Printf("%[2]*.[1]*[3]d", 2, 3, 4)
fmt.Fprintf(os.Stderr, "%[2]*.[1]*[3]d", 2, 3, 4) // Use Fprintf to make sure we count arguments correctly.
// Bad argument reorderings.
- Printf("%[xd", 3) // ERROR "bad syntax for printf argument index: \[xd\]"
- Printf("%[x]d", 3) // ERROR "bad syntax for printf argument index: \[x\]"
- Printf("%[3]*s", "hi", 2) // ERROR "missing argument for Printf.* reads arg 3, have only 2"
- _ = fmt.Sprintf("%[3]d", 2) // ERROR "missing argument for Sprintf.* reads arg 3, have only 1"
- Printf("%[2]*.[1]*[3]d", 2, "hi", 4) // ERROR "arg .hi. for \* in printf format not of type int"
- Printf("%[0]s", "arg1") // ERROR "index value \[0\] for Printf.*; indexes start at 1"
- Printf("%[0]d", 1) // ERROR "index value \[0\] for Printf.*; indexes start at 1"
+ Printf("%[xd", 3) // ERROR "Printf format %\[xd is missing closing \]"
+ Printf("%[x]d x", 3) // ERROR "Printf format has invalid argument index \[x\]"
+ Printf("%[3]*s x", "hi", 2) // ERROR "Printf format has invalid argument index \[3\]"
+ _ = fmt.Sprintf("%[3]d x", 2) // ERROR "Sprintf format has invalid argument index \[3\]"
+ Printf("%[2]*.[1]*[3]d x", 2, "hi", 4) // ERROR "Printf format %\[2]\*\.\[1\]\*\[3\]d uses non-int \x22hi\x22 as argument of \*"
+ Printf("%[0]s x", "arg1") // ERROR "Printf format has invalid argument index \[0\]"
+ Printf("%[0]d x", 1) // ERROR "Printf format has invalid argument index \[0\]"
// Something that satisfies the error interface.
var e error
fmt.Println(e.Error()) // ok
@@ -197,11 +197,11 @@
var et1 errorTest1
fmt.Println(et1.Error()) // ok
fmt.Println(et1.Error("hi")) // ok
- fmt.Println(et1.Error("%d", 3)) // ERROR "possible formatting directive in Error call"
+ fmt.Println(et1.Error("%d", 3)) // ERROR "Error call has possible formatting directive %d"
var et2 errorTest2
et2.Error() // ok
et2.Error("hi") // ok, not an error method.
- et2.Error("%d", 3) // ERROR "possible formatting directive in Error call"
+ et2.Error("%d", 3) // ERROR "Error call has possible formatting directive %d"
var et3 errorTest3
et3.Error() // ok, not an error method.
var et4 errorTest4
@@ -214,9 +214,9 @@
}
fmt.Printf("%f", iface) // ok: fmt treats interfaces as transparent and iface may well have a float concrete type
// Can't print a function.
- Printf("%d", someFunction) // ERROR "arg someFunction in printf call is a function value, not a function call"
- Printf("%v", someFunction) // ERROR "arg someFunction in printf call is a function value, not a function call"
- Println(someFunction) // ERROR "arg someFunction in Println call is a function value, not a function call"
+ Printf("%d", someFunction) // ERROR "Printf format %d arg someFunction is a func value, not called"
+ Printf("%v", someFunction) // ERROR "Printf format %v arg someFunction is a func value, not called"
+ Println(someFunction) // ERROR "Println arg someFunction is a func value, not called"
Printf("%p", someFunction) // ok: maybe someone wants to see the pointer
Printf("%T", someFunction) // ok: maybe someone wants to see the type
// Bug: used to recur forever.
@@ -227,17 +227,17 @@
// Special handling for Log.
math.Log(3) // OK
Log(3) // OK
- Log("%d", 3) // ERROR "possible formatting directive in Log call"
+ Log("%d", 3) // ERROR "Log call has possible formatting directive %d"
Logf("%d", 3)
- Logf("%d", "hi") // ERROR "arg .hi. for printf verb %d of wrong type: string"
+ Logf("%d", "hi") // ERROR "Logf format %d has arg \x22hi\x22 of wrong type string"
Errorf(1, "%d", 3) // OK
- Errorf(1, "%d", "hi") // ERROR "arg .hi. for printf verb %d of wrong type: string"
+ Errorf(1, "%d", "hi") // ERROR "Errorf format %d has arg \x22hi\x22 of wrong type string"
// Multiple string arguments before variadic args
errorf("WARNING", "foobar") // OK
errorf("INFO", "s=%s, n=%d", "foo", 1) // OK
- errorf("ERROR", "%d") // ERROR "format reads arg 1, have only 0 args"
+ errorf("ERROR", "%d") // ERROR "errorf format %d reads arg #1, but call has only 0 args"
// Printf from external package
externalprintf.Printf("%d", 42) // OK
@@ -245,7 +245,7 @@
level := 123
externalprintf.Logf(level, "%d", 42) // OK
externalprintf.Errorf(level, level, "foo %q bar", "foobar") // OK
- externalprintf.Logf(level, "%d") // ERROR "format reads arg 1, have only 0 args"
+ externalprintf.Logf(level, "%d") // ERROR "Logf format %d reads arg #1, but call has only 0 args"
var formatStr = "%s %s"
externalprintf.Sprintf(formatStr, "a", "b") // OK
externalprintf.Logf(level, formatStr, "a", "b") // OK
@@ -256,21 +256,30 @@
ss.Error(someFunction, someFunction) // OK
ss.Println() // OK
ss.Println(1.234, "foo") // OK
- ss.Println(1, someFunction) // ERROR "arg someFunction in Println call is a function value, not a function call"
+ ss.Println(1, someFunction) // ERROR "Println arg someFunction is a func value, not called"
ss.log(someFunction) // OK
ss.log(someFunction, "bar", 1.33) // OK
- ss.log(someFunction, someFunction) // ERROR "arg someFunction in log call is a function value, not a function call"
+ ss.log(someFunction, someFunction) // ERROR "log arg someFunction is a func value, not called"
// indexed arguments
- Printf("%d %[3]d %d %[2]d", 1, 2, 3, 4) // OK
- Printf("%d %[0]d %d %[2]d", 1, 2, 3, 4) // ERROR "indexes start at 1"
- Printf("%d %[3]d %d %[-2]d", 1, 2, 3, 4) // ERROR "bad syntax for printf argument index: \[-2\]"
- Printf("%d %[3]d %d %[2234234234234]d", 1, 2, 3, 4) // ERROR "bad syntax for printf argument index: .+ value out of range"
- Printf("%d %[3]d %d %[2]d", 1, 2, 3) // ERROR "format reads arg 4, have only 3 args"
- Printf("%d %[3]d %d %[2]d", 1, 2, 3, 4, 5) // ERROR "wrong number of args for format in Printf call: 4 needed but 5 args"
- Printf("%[1][3]d", 1, 2) // ERROR "unrecognized printf verb '\['"
+ Printf("%d %[3]d %d %[2]d x", 1, 2, 3, 4) // OK
+ Printf("%d %[0]d %d %[2]d x", 1, 2, 3, 4) // ERROR "Printf format has invalid argument index \[0\]"
+ Printf("%d %[3]d %d %[-2]d x", 1, 2, 3, 4) // ERROR "Printf format has invalid argument index \[-2\]"
+ Printf("%d %[3]d %d %[2234234234234]d x", 1, 2, 3, 4) // ERROR "Printf format has invalid argument index \[2234234234234\]"
+ Printf("%d %[3]d %-10d %[2]d x", 1, 2, 3) // ERROR "Printf format %-10d reads arg #4, but call has only 3 args"
+ Printf("%d %[3]d %d %[2]d x", 1, 2, 3, 4, 5) // ERROR "Printf call needs 4 args but has 5 args"
+ Printf("%[1][3]d x", 1, 2) // ERROR "Printf format %\[1\]\[ has unknown verb \["
+
+ // wrote Println but meant Fprintln
+ Printf("%p\n", os.Stdout) // OK
+ Println(os.Stdout, "hello") // ERROR "Println does not take io.Writer but has first arg os.Stdout"
+
+ Printf(someString(), "hello") // OK
+
}
+func someString() string
+
type someStruct struct{}
// Log is non-variadic user-define Println-like function.
@@ -414,17 +423,17 @@
func (s recursiveStringer) String() string {
_ = fmt.Sprintf("%d", s)
_ = fmt.Sprintf("%#v", s)
- _ = fmt.Sprintf("%v", s) // ERROR "arg s for printf causes recursive call to String method"
- _ = fmt.Sprintf("%v", &s) // ERROR "arg &s for printf causes recursive call to String method"
+ _ = fmt.Sprintf("%v", s) // ERROR "Sprintf format %v with arg s causes recursive String method call"
+ _ = fmt.Sprintf("%v", &s) // ERROR "Sprintf format %v with arg &s causes recursive String method call"
_ = fmt.Sprintf("%T", s) // ok; does not recursively call String
- return fmt.Sprintln(s) // ERROR "arg s in Sprintln call causes recursive call to String method"
+ return fmt.Sprintln(s) // ERROR "Sprintln arg s causes recursive call to String method"
}
type recursivePtrStringer int
func (p *recursivePtrStringer) String() string {
_ = fmt.Sprintf("%v", *p)
- return fmt.Sprintln(p) // ERROR "arg p in Sprintln call causes recursive call to String method"
+ return fmt.Sprintln(p) // ERROR "Sprintln arg p causes recursive call to String method"
}
type Formatter bool
@@ -500,27 +509,27 @@
func UnexportedStringerOrError() {
us := unexportedStringer{}
- fmt.Printf("%s", us) // ERROR "arg us for printf verb %s of wrong type"
- fmt.Printf("%s", &us) // ERROR "arg &us for printf verb %s of wrong type"
+ fmt.Printf("%s", us) // ERROR "Printf format %s has arg us of wrong type testdata.unexportedStringer"
+ fmt.Printf("%s", &us) // ERROR "Printf format %s has arg &us of wrong type [*]testdata.unexportedStringer"
usf := unexportedStringerOtherFields{
s: "foo",
S: "bar",
}
- fmt.Printf("%s", usf) // ERROR "arg usf for printf verb %s of wrong type"
- fmt.Printf("%s", &usf) // ERROR "arg &usf for printf verb %s of wrong type"
+ fmt.Printf("%s", usf) // ERROR "Printf format %s has arg usf of wrong type testdata.unexportedStringerOtherFields"
+ fmt.Printf("%s", &usf) // ERROR "Printf format %s has arg &usf of wrong type [*]testdata.unexportedStringerOtherFields"
ue := unexportedError{
e: &errorer{},
}
- fmt.Printf("%s", ue) // ERROR "arg ue for printf verb %s of wrong type"
- fmt.Printf("%s", &ue) // ERROR "arg &ue for printf verb %s of wrong type"
+ fmt.Printf("%s", ue) // ERROR "Printf format %s has arg ue of wrong type testdata.unexportedError"
+ fmt.Printf("%s", &ue) // ERROR "Printf format %s has arg &ue of wrong type [*]testdata.unexportedError"
uef := unexportedErrorOtherFields{
s: "foo",
e: &errorer{},
S: "bar",
}
- fmt.Printf("%s", uef) // ERROR "arg uef for printf verb %s of wrong type"
- fmt.Printf("%s", &uef) // ERROR "arg &uef for printf verb %s of wrong type"
+ fmt.Printf("%s", uef) // ERROR "Printf format %s has arg uef of wrong type testdata.unexportedErrorOtherFields"
+ fmt.Printf("%s", &uef) // ERROR "Printf format %s has arg &uef of wrong type [*]testdata.unexportedErrorOtherFields"
}
diff --git a/src/cmd/vet/testdata/shift.go b/src/cmd/vet/testdata/shift.go
index 50a042e..73cbaf8 100644
--- a/src/cmd/vet/testdata/shift.go
+++ b/src/cmd/vet/testdata/shift.go
@@ -6,7 +6,10 @@
package testdata
-import "unsafe"
+import (
+ "fmt"
+ "unsafe"
+)
func ShiftTest() {
var i8 int8
@@ -154,6 +157,6 @@
// Make sure other vet checks work in dead code.
if iBits == 1024 {
_ = i << 512 // OK
- fmt.Printf("foo %s bar", 123) // ERROR "arg 123 for printf verb %s of wrong type: untyped int"
+ fmt.Printf("foo %s bar", 123) // ERROR "Printf"
}
}
To view, visit change 74352. To unsubscribe, or for help writing mail filters, visit settings.
Reply all
Reply to author
Forward
0 new messages