From 88e3b261f28032aa04435fc7aeae5d27d26bf777 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Wed, 12 Dec 2018 19:26:57 -0500 Subject: [PATCH] cmd/godoc: print a helpful error if used for command-line docs The command-line interface was recently removed in favor of "go doc". Change-Id: Idfcfca3b2eafaf63148a2ed88d4d25c61d9e3c69 Reviewed-on: https://go-review.googlesource.com/c/153869 Reviewed-by: Brad Fitzpatrick --- cmd/godoc/main.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/cmd/godoc/main.go b/cmd/godoc/main.go index db545076..849bd5db 100644 --- a/cmd/godoc/main.go +++ b/cmd/godoc/main.go @@ -163,15 +163,13 @@ func main() { playEnabled = *showPlayground - // Check usage: server and no args. - if (*httpAddr != "" || *urlFlag != "") && (flag.NArg() > 0) { - fmt.Fprintln(os.Stderr, "Unexpected arguments.") + // Check usage. + if flag.NArg() > 0 { + fmt.Fprintln(os.Stderr, `Unexpected arguments. Use "go doc" for command-line help output instead. For example, "go doc -all net/http".`) usage() } - - // Check usage: command line args or index creation mode. - if (*httpAddr != "" || *urlFlag != "") != (flag.NArg() == 0) && !*writeIndex { - fmt.Fprintln(os.Stderr, "missing args.") + if *httpAddr != "" && *urlFlag != "" && !*writeIndex { + fmt.Fprintln(os.Stderr, "Missing args.") usage() }