From ce707438ee3038d1812efffd5b15a5cb62ed0d9b Mon Sep 17 00:00:00 2001 From: huiyifyj Date: Wed, 29 Mar 2023 20:29:29 +0800 Subject: [PATCH] Remove redundant variable declarations --- flag_generic.go | 9 ++------- flag_path.go | 9 ++------- flag_string.go | 6 ++---- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/flag_generic.go b/flag_generic.go index 4f9ac0a7ff..039ffdfeee 100644 --- a/flag_generic.go +++ b/flag_generic.go @@ -117,13 +117,8 @@ func (cCtx *Context) Generic(name string) interface{} { } func lookupGeneric(name string, set *flag.FlagSet) interface{} { - f := set.Lookup(name) - if f != nil { - parsed, err := f.Value, error(nil) - if err != nil { - return nil - } - return parsed + if f := set.Lookup(name); f != nil { + return f.Value } return nil } diff --git a/flag_path.go b/flag_path.go index 6434d3224f..c4986779de 100644 --- a/flag_path.go +++ b/flag_path.go @@ -90,13 +90,8 @@ func (cCtx *Context) Path(name string) string { } func lookupPath(name string, set *flag.FlagSet) string { - f := set.Lookup(name) - if f != nil { - parsed, err := f.Value.String(), error(nil) - if err != nil { - return "" - } - return parsed + if f := set.Lookup(name); f != nil { + return f.Value.String() } return "" } diff --git a/flag_string.go b/flag_string.go index 3050086e87..4e55a2ca30 100644 --- a/flag_string.go +++ b/flag_string.go @@ -87,10 +87,8 @@ func (cCtx *Context) String(name string) string { } func lookupString(name string, set *flag.FlagSet) string { - f := set.Lookup(name) - if f != nil { - parsed := f.Value.String() - return parsed + if f := set.Lookup(name); f != nil { + return f.Value.String() } return "" }