summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Flint <[email protected]>2024-12-11 17:25:19 +1100
committerGitHub <[email protected]>2024-12-11 17:25:19 +1100
commitf21878956cd90217e8baf6e680f42b6868a820bc (patch)
treed90ab3a0db3dc04aa4fd58823a36601e89b608fd
parent438bbfff1edeb3e65a0af4d385151788a5306644 (diff)
parenta7ee83cf5d7c5e4594d70b06a9b085d7009d7b9e (diff)
Merge pull request #276 from zanvd/make-placeholder-output-consistent
Make field name output consistent when using placeholders
-rw-r--r--parse.go11
1 files changed, 3 insertions, 8 deletions
diff --git a/parse.go b/parse.go
index 8ef1400..3a08b10 100644
--- a/parse.go
+++ b/parse.go
@@ -746,13 +746,13 @@ func (p *Parser) process(args []string) error {
if spec.cardinality == multiple {
err := setSliceOrMap(p.val(spec.dest), positionals, true)
if err != nil {
- return fmt.Errorf("error processing %s: %v", spec.field.Name, err)
+ return fmt.Errorf("error processing %s: %v", spec.placeholder, err)
}
positionals = nil
} else {
err := scalar.ParseValue(p.val(spec.dest), positionals[0])
if err != nil {
- return fmt.Errorf("error processing %s: %v", spec.field.Name, err)
+ return fmt.Errorf("error processing %s: %v", spec.placeholder, err)
}
positionals = positionals[1:]
}
@@ -767,18 +767,13 @@ func (p *Parser) process(args []string) error {
continue
}
- name := strings.ToLower(spec.field.Name)
- if spec.long != "" && !spec.positional {
- name = "--" + spec.long
- }
-
if spec.required {
if spec.short == "" && spec.long == "" {
msg := fmt.Sprintf("environment variable %s is required", spec.env)
return errors.New(msg)
}
- msg := fmt.Sprintf("%s is required", name)
+ msg := fmt.Sprintf("%s is required", spec.placeholder)
if spec.env != "" {
msg += " (or environment variable " + spec.env + ")"
}