Improve error message for invalid long names

google · Oct 22, 2023 · 3d2e6f6 · 3d2e6f6
1 parent c2b8549
commit 3d2e6f6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/argh/tests/ui/bad-long-names/bad-long-names.rs b/argh/tests/ui/bad-long-names/bad-long-names.rs
@@ -5,9 +5,9 @@ struct Cmd {
  /// non-ascii
  привет: bool,
  #[argh(switch)]
- /// uppercase
+ /// invalid character
  XMLHTTPRequest: bool,
- #[argh(switch, long = "not really")]
+ #[argh(switch, long = "invalid_character")]
  /// bad attr
  ok: bool,
 }

diff --git a/argh/tests/ui/bad-long-names/bad-long-names.stderr b/argh/tests/ui/bad-long-names/bad-long-names.stderr
@@ -4,14 +4,14 @@ error: Long names must be ASCII
 6 | привет: bool,
  | ^^^^^^
 
-error: Long names must be lowercase
+error: Long names may only contain lowercase letters, digits, and dashes
  --> tests/ui/bad-long-names/bad-long-names.rs:9:5
  |
 9 | XMLHTTPRequest: bool,
  | ^^^^^^^^^^^^^^
 
-error: Long names must be lowercase
+error: Long names may only contain lowercase letters, digits, and dashes
  --> tests/ui/bad-long-names/bad-long-names.rs:10:27
  |
-10 | #[argh(switch, long = "not really")]
- | ^^^^^^^^^^^^
+10 | #[argh(switch, long = "invalid_character")]
+ | ^^^^^^^^^^^^^^^^^^^
diff --git a/argh_derive/src/parse_attrs.rs b/argh_derive/src/parse_attrs.rs
@@ -201,7 +201,7 @@ pub(crate) fn check_long_name(errors: &Errors, spanned: &impl syn::spanned::Span
  errors.err(spanned, "Long names must be ASCII");
  }
  if !value.chars().all(|c| c.is_lowercase() || c == '-' || c.is_ascii_digit()) {
- errors.err(spanned, "Long names must be lowercase");
+ errors.err(spanned, "Long names may only contain lowercase letters, digits, and dashes");
  }
 }