From 7ccaf0a21fedf97d7dd429cd75f00bc0a15a882b Mon Sep 17 00:00:00 2001 From: Scott Blum Date: Wed, 22 Nov 2023 08:54:31 -0500 Subject: [PATCH] indent: rip out old go 1.9 support --- cmd/grpcurl/go1_10.go | 10 ---------- cmd/grpcurl/go1_9.go | 10 ---------- cmd/grpcurl/grpcurl.go | 2 +- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 cmd/grpcurl/go1_10.go delete mode 100644 cmd/grpcurl/go1_9.go diff --git a/cmd/grpcurl/go1_10.go b/cmd/grpcurl/go1_10.go deleted file mode 100644 index 815e672..0000000 --- a/cmd/grpcurl/go1_10.go +++ /dev/null @@ -1,10 +0,0 @@ -//go:build go1.10 -// +build go1.10 - -package main - -func indent() string { - // In Go 1.10 and up, the flag package automatically - // adds the right indentation. - return "" -} diff --git a/cmd/grpcurl/go1_9.go b/cmd/grpcurl/go1_9.go deleted file mode 100644 index 0b2774e..0000000 --- a/cmd/grpcurl/go1_9.go +++ /dev/null @@ -1,10 +0,0 @@ -//go:build !go1.10 -// +build !go1.10 - -package main - -func indent() string { - // In Go 1.9 and older, we need to add indentation - // after newlines in the flag doc strings. - return " \t" -} diff --git a/cmd/grpcurl/grpcurl.go b/cmd/grpcurl/grpcurl.go index 475358d..6ef517b 100644 --- a/cmd/grpcurl/grpcurl.go +++ b/cmd/grpcurl/grpcurl.go @@ -825,7 +825,7 @@ func prettify(docString string) string { j++ } - return strings.Join(parts[:j], "\n"+indent()) + return strings.Join(parts[:j], "\n") } func warn(msg string, args ...interface{}) {