From 7159ab4871793b844da21538b3a8298d0646935b Mon Sep 17 00:00:00 2001 From: Alan Donovan Date: Fri, 8 Sep 2017 14:45:59 -0400 Subject: [PATCH] cmd/vet: print: permit '#' flag in %e, %f, and %g + Test Change-Id: I7b42ff70f26a58e1cf58cbbc53d02a65623456ae Reviewed-on: https://go-review.googlesource.com/62371 Run-TryBot: Ian Lance Taylor Reviewed-by: Rob Pike TryBot-Result: Gobot Gobot --- src/cmd/vet/print.go | 12 ++++++------ src/cmd/vet/testdata/print.go | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/cmd/vet/print.go b/src/cmd/vet/print.go index dae307695b..21bb0d0997 100644 --- a/src/cmd/vet/print.go +++ b/src/cmd/vet/print.go @@ -440,12 +440,12 @@ var printVerbs = []printVerb{ {'b', numFlag, argInt | argFloat | argComplex}, {'c', "-", argRune | argInt}, {'d', numFlag, argInt}, - {'e', numFlag, argFloat | argComplex}, - {'E', numFlag, argFloat | argComplex}, - {'f', numFlag, argFloat | argComplex}, - {'F', numFlag, argFloat | argComplex}, - {'g', numFlag, argFloat | argComplex}, - {'G', numFlag, argFloat | argComplex}, + {'e', sharpNumFlag, argFloat | argComplex}, + {'E', sharpNumFlag, argFloat | argComplex}, + {'f', sharpNumFlag, argFloat | argComplex}, + {'F', sharpNumFlag, argFloat | argComplex}, + {'g', sharpNumFlag, argFloat | argComplex}, + {'G', sharpNumFlag, argFloat | argComplex}, {'o', sharpNumFlag, argInt}, {'p', "-#", argPointer}, {'q', " -+.0#", argRune | argInt | argString}, diff --git a/src/cmd/vet/testdata/print.go b/src/cmd/vet/testdata/print.go index 219b895ea0..38743b109e 100644 --- a/src/cmd/vet/testdata/print.go +++ b/src/cmd/vet/testdata/print.go @@ -102,6 +102,7 @@ func PrintfTests() { fmt.Printf("%s", interface{}(nil)) // Nothing useful we can say. 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"