Skip to content

Commit c0cc5c2

Browse files
authored
Merge pull request #1714 from huiyifyj/v2-remove-var
Remove redundant variable declarations
2 parents 31b7abb + ce70743 commit c0cc5c2

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

flag_generic.go

+2-7
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,8 @@ func (cCtx *Context) Generic(name string) interface{} {
117117
}
118118

119119
func lookupGeneric(name string, set *flag.FlagSet) interface{} {
120-
f := set.Lookup(name)
121-
if f != nil {
122-
parsed, err := f.Value, error(nil)
123-
if err != nil {
124-
return nil
125-
}
126-
return parsed
120+
if f := set.Lookup(name); f != nil {
121+
return f.Value
127122
}
128123
return nil
129124
}

flag_path.go

+2-7
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,8 @@ func (cCtx *Context) Path(name string) string {
9090
}
9191

9292
func lookupPath(name string, set *flag.FlagSet) string {
93-
f := set.Lookup(name)
94-
if f != nil {
95-
parsed, err := f.Value.String(), error(nil)
96-
if err != nil {
97-
return ""
98-
}
99-
return parsed
93+
if f := set.Lookup(name); f != nil {
94+
return f.Value.String()
10095
}
10196
return ""
10297
}

flag_string.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,8 @@ func (cCtx *Context) String(name string) string {
8787
}
8888

8989
func lookupString(name string, set *flag.FlagSet) string {
90-
f := set.Lookup(name)
91-
if f != nil {
92-
parsed := f.Value.String()
93-
return parsed
90+
if f := set.Lookup(name); f != nil {
91+
return f.Value.String()
9492
}
9593
return ""
9694
}

0 commit comments

Comments
 (0)