From 4730aa0d979f34d4f7427d524b84043557ba72ef Mon Sep 17 00:00:00 2001 From: Georges Varouchas Date: Mon, 9 Jun 2025 22:38:23 +0400 Subject: fix help message for Func and BoolFunc flags #430 * have '.Type()' for boolfuncValue return "boolfunc" (dedicated value, which now makes it distinct from funcValue) * hide extra "(default )" by stating that "" should be treated as a zero value for a boolFlag note: - a boolfuncValue matches 'case boolFlag:', as it implements the boolFlag interface, - treating "" as a value which shouldn't trigger a "(default )" for a regular Bool flag does not look like a breaking change * hide extra "[=something]" for boolfuncValue * set default placeholder name for "boolfunc" and "func" flag types --- bool_func.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bool_func.go') diff --git a/bool_func.go b/bool_func.go index 05783a9..76422bf 100644 --- a/bool_func.go +++ b/bool_func.go @@ -5,7 +5,7 @@ type boolfuncValue func(string) error func (f boolfuncValue) Set(s string) error { return f(s) } -func (f boolfuncValue) Type() string { return "func" } +func (f boolfuncValue) Type() string { return "boolfunc" } func (f boolfuncValue) String() string { return "" } // same behavior as stdlib 'flag' package -- cgit v1.2.3 From 1a4b5b2e5c7ee4a194cebc579bb34198187df73d Mon Sep 17 00:00:00 2001 From: Georges Varouchas Date: Fri, 27 Jun 2025 18:02:03 +0200 Subject: fix discrepancy in order of arguments for Func() and BoolFunc() #433 for no good reason: the order of arguments would differ when calling pflag.BoolFuncP(...) and (*FlagSet).BoolFuncP(...) (same goes for Func() and FuncP()) in this commit: align all functions on stdlib's order fixes #433 --- bool_func.go | 2 +- func.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bool_func.go') diff --git a/bool_func.go b/bool_func.go index 76422bf..83d77af 100644 --- a/bool_func.go +++ b/bool_func.go @@ -35,6 +35,6 @@ func BoolFunc(name string, usage string, fn func(string) error) { } // BoolFuncP is like BoolFunc, but accepts a shorthand letter that can be used after a single dash. -func BoolFuncP(name, shorthand string, fn func(string) error, usage string) { +func BoolFuncP(name, shorthand string, usage string, fn func(string) error) { CommandLine.BoolFuncP(name, shorthand, usage, fn) } diff --git a/func.go b/func.go index e5f5436..9f4d88f 100644 --- a/func.go +++ b/func.go @@ -27,11 +27,11 @@ func (f *FlagSet) FuncP(name string, shorthand string, usage string, fn func(str // // The callback function will be called every time "--{name}={value}" (or equivalent) is // parsed on the command line, with "{value}" as an argument. -func Func(name string, fn func(string) error, usage string) { +func Func(name string, usage string, fn func(string) error) { CommandLine.FuncP(name, "", usage, fn) } // FuncP is like Func, but accepts a shorthand letter that can be used after a single dash. -func FuncP(name, shorthand string, fn func(string) error, usage string) { +func FuncP(name, shorthand string, usage string, fn func(string) error) { CommandLine.FuncP(name, shorthand, usage, fn) } -- cgit v1.2.3