Skip to content

Commit c4a55df

Browse files
committed
cli: rename args that collided with builtins (predeclard)
cli/required.go:33:22: param min has same name as predeclared identifier (predeclared) func RequiresMinArgs(min int) cobra.PositionalArgs { ^ cli/required.go:50:22: param max has same name as predeclared identifier (predeclared) func RequiresMaxArgs(max int) cobra.PositionalArgs { ^ cli/required.go:67:24: param min has same name as predeclared identifier (predeclared) func RequiresRangeArgs(min int, max int) cobra.PositionalArgs { ^ Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 9c87891 commit c4a55df

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

cli/required.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -30,52 +30,52 @@ func NoArgs(cmd *cobra.Command, args []string) error {
3030
}
3131

3232
// RequiresMinArgs returns an error if there is not at least min args
33-
func RequiresMinArgs(min int) cobra.PositionalArgs {
33+
func RequiresMinArgs(minArgs int) cobra.PositionalArgs {
3434
return func(cmd *cobra.Command, args []string) error {
35-
if len(args) >= min {
35+
if len(args) >= minArgs {
3636
return nil
3737
}
3838
return errors.Errorf(
3939
"%[1]s: '%[2]s' requires at least %[3]d %[4]s\n\nUsage: %[5]s\n\nSee '%[2]s --help' for more information",
4040
binName(cmd),
4141
cmd.CommandPath(),
42-
min,
43-
pluralize("argument", min),
42+
minArgs,
43+
pluralize("argument", minArgs),
4444
cmd.UseLine(),
4545
)
4646
}
4747
}
4848

4949
// RequiresMaxArgs returns an error if there is not at most max args
50-
func RequiresMaxArgs(max int) cobra.PositionalArgs {
50+
func RequiresMaxArgs(maxArgs int) cobra.PositionalArgs {
5151
return func(cmd *cobra.Command, args []string) error {
52-
if len(args) <= max {
52+
if len(args) <= maxArgs {
5353
return nil
5454
}
5555
return errors.Errorf(
5656
"%[1]s: '%[2]s' requires at most %[3]d %[4]s\n\nUsage: %[5]s\n\nSRun '%[2]s --help' for more information",
5757
binName(cmd),
5858
cmd.CommandPath(),
59-
max,
60-
pluralize("argument", max),
59+
maxArgs,
60+
pluralize("argument", maxArgs),
6161
cmd.UseLine(),
6262
)
6363
}
6464
}
6565

6666
// RequiresRangeArgs returns an error if there is not at least min args and at most max args
67-
func RequiresRangeArgs(min int, max int) cobra.PositionalArgs {
67+
func RequiresRangeArgs(minArgs int, maxArgs int) cobra.PositionalArgs {
6868
return func(cmd *cobra.Command, args []string) error {
69-
if len(args) >= min && len(args) <= max {
69+
if len(args) >= minArgs && len(args) <= maxArgs {
7070
return nil
7171
}
7272
return errors.Errorf(
7373
"%[1]s: '%[2]s' requires at least %[3]d and at most %[4]d %[5]s\n\nUsage: %[6]s\n\nRun '%[2]s --help' for more information",
7474
binName(cmd),
7575
cmd.CommandPath(),
76-
min,
77-
max,
78-
pluralize("argument", max),
76+
minArgs,
77+
maxArgs,
78+
pluralize("argument", maxArgs),
7979
cmd.UseLine(),
8080
)
8181
}

0 commit comments

Comments
 (0)