From ece05f910e6bbd8816c4b39d6d24377d79396aa8 Mon Sep 17 00:00:00 2001 From: Rob Pike Date: Mon, 16 Sep 2013 08:18:27 +1000 Subject: [PATCH] go.tools/cmd/vet: update for fmt handling %b for complex numbers R=golang-dev, adg CC=golang-dev https://golang.org/cl/13490048 --- cmd/vet/print.go | 2 +- cmd/vet/testdata/print.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/vet/print.go b/cmd/vet/print.go index 3532d36d..9f4e37c1 100644 --- a/cmd/vet/print.go +++ b/cmd/vet/print.go @@ -308,7 +308,7 @@ var printVerbs = []printVerb{ // '#' is alternate format for several verbs. // ' ' is spacer for numbers {'%', noFlag, 0}, - {'b', numFlag, argInt | argFloat}, + {'b', numFlag, argInt | argFloat | argComplex}, {'c', "-", argRune | argInt}, {'d', numFlag, argInt}, {'e', numFlag, argFloat | argComplex}, diff --git a/cmd/vet/testdata/print.go b/cmd/vet/testdata/print.go index eec69bf7..ff388bd4 100644 --- a/cmd/vet/testdata/print.go +++ b/cmd/vet/testdata/print.go @@ -67,6 +67,7 @@ func PrintfTests() { fmt.Printf("%F %F %F %F", 3e9, x, fslice, c) fmt.Printf("%g %g %g %g", 3e9, x, fslice, c) fmt.Printf("%G %G %G %G", 3e9, x, fslice, c) + fmt.Printf("%b %b %b %b", 3e9, x, fslice, c) fmt.Printf("%o %o", 3, i) fmt.Printf("%p %p", p, nil) fmt.Printf("%q %q %q %q", 3, i, 'x', r) @@ -95,8 +96,8 @@ func PrintfTests() { fmt.Printf("%g", 1+2i) // Some bad format/argTypes fmt.Printf("%b", "hi") // ERROR "arg .hi. for printf verb %b of wrong type" - fmt.Printf("%b", c) // ERROR "arg c for printf verb %b of wrong type" - fmt.Printf("%b", 1+2i) // ERROR "arg 1 \+ 2i 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"