Skip to content

Commit f218789

Browse files
authored
Merge pull request #276 from zanvd/make-placeholder-output-consistent
Make field name output consistent when using placeholders
2 parents 438bbff + a7ee83c commit f218789

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

parse.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -746,13 +746,13 @@ func (p *Parser) process(args []string) error {
746746
if spec.cardinality == multiple {
747747
err := setSliceOrMap(p.val(spec.dest), positionals, true)
748748
if err != nil {
749-
return fmt.Errorf("error processing %s: %v", spec.field.Name, err)
749+
return fmt.Errorf("error processing %s: %v", spec.placeholder, err)
750750
}
751751
positionals = nil
752752
} else {
753753
err := scalar.ParseValue(p.val(spec.dest), positionals[0])
754754
if err != nil {
755-
return fmt.Errorf("error processing %s: %v", spec.field.Name, err)
755+
return fmt.Errorf("error processing %s: %v", spec.placeholder, err)
756756
}
757757
positionals = positionals[1:]
758758
}
@@ -767,18 +767,13 @@ func (p *Parser) process(args []string) error {
767767
continue
768768
}
769769

770-
name := strings.ToLower(spec.field.Name)
771-
if spec.long != "" && !spec.positional {
772-
name = "--" + spec.long
773-
}
774-
775770
if spec.required {
776771
if spec.short == "" && spec.long == "" {
777772
msg := fmt.Sprintf("environment variable %s is required", spec.env)
778773
return errors.New(msg)
779774
}
780775

781-
msg := fmt.Sprintf("%s is required", name)
776+
msg := fmt.Sprintf("%s is required", spec.placeholder)
782777
if spec.env != "" {
783778
msg += " (or environment variable " + spec.env + ")"
784779
}

0 commit comments

Comments
 (0)