diff --git a/cmd/callgraph/main.go b/cmd/callgraph/main.go index f74c278c99..f83be0ea56 100644 --- a/cmd/callgraph/main.go +++ b/cmd/callgraph/main.go @@ -166,7 +166,7 @@ var stdout io.Writer = os.Stdout func doCallgraph(dir, gopath, algo, format string, tests bool, args []string) error { if len(args) == 0 { - fmt.Fprintln(os.Stderr, Usage) + fmt.Fprint(os.Stderr, Usage) return nil } diff --git a/cmd/cover/cover.go b/cmd/cover/cover.go index e09336499b..42a7e37aaa 100644 --- a/cmd/cover/cover.go +++ b/cmd/cover/cover.go @@ -42,8 +42,8 @@ Finally, to generate modified source code with coverage annotations ` func usage() { - fmt.Fprintln(os.Stderr, usageMessage) - fmt.Fprintln(os.Stderr, "Flags:") + fmt.Fprint(os.Stderr, usageMessage) + fmt.Fprintln(os.Stderr, "\nFlags:") flag.PrintDefaults() fmt.Fprintln(os.Stderr, "\n Only one of -html, -func, or -mode may be set.") os.Exit(2) diff --git a/cmd/eg/eg.go b/cmd/eg/eg.go index 6463ac42dd..1629b801cd 100644 --- a/cmd/eg/eg.go +++ b/cmd/eg/eg.go @@ -59,7 +59,8 @@ func doMain() error { args := flag.Args() if *helpFlag { - fmt.Fprint(os.Stderr, eg.Help) + help := eg.Help // hide %s from vet + fmt.Fprint(os.Stderr, help) os.Exit(2) } diff --git a/cmd/gomvpkg/main.go b/cmd/gomvpkg/main.go index 20f6111c41..5de1e44062 100644 --- a/cmd/gomvpkg/main.go +++ b/cmd/gomvpkg/main.go @@ -83,7 +83,7 @@ func main() { } if *helpFlag || *fromFlag == "" || *toFlag == "" { - fmt.Println(Usage) + fmt.Print(Usage) return } diff --git a/cmd/gorename/main.go b/cmd/gorename/main.go index 03e9958346..e59abd7588 100644 --- a/cmd/gorename/main.go +++ b/cmd/gorename/main.go @@ -46,7 +46,7 @@ func main() { } if *helpFlag || (*offsetFlag == "" && *fromFlag == "" && *toFlag == "") { - fmt.Println(rename.Usage) + fmt.Print(rename.Usage) return } diff --git a/cmd/gotype/gotype.go b/cmd/gotype/gotype.go index dbb2626c10..22fe4aa9d2 100644 --- a/cmd/gotype/gotype.go +++ b/cmd/gotype/gotype.go @@ -167,7 +167,8 @@ files to include for such packages. ` func usage() { - fmt.Fprintln(os.Stderr, usageString) + fmt.Fprint(os.Stderr, usageString) + fmt.Fprintln(os.Stderr) flag.PrintDefaults() os.Exit(2) } diff --git a/cmd/guru/main.go b/cmd/guru/main.go index 8e4af004a9..4fde4d2d2d 100644 --- a/cmd/guru/main.go +++ b/cmd/guru/main.go @@ -105,8 +105,8 @@ Example: describe syntax at offset 530 in this file (an import spec): ` func printHelp() { - fmt.Fprintln(os.Stderr, helpMessage) - fmt.Fprintln(os.Stderr, "Flags:") + fmt.Fprint(os.Stderr, helpMessage) + fmt.Fprintln(os.Stderr, "\nFlags:") flag.PrintDefaults() }