Merge pull request #4124 from miguelff/v3-master

[Backport] Fix: Amend error message when deriving enums
clap-rs · Aug 26, 2022 · d3f0931 · d3f0931
2 parents 88b941f + dae2bb7
commit d3f0931
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/clap_derive/src/derives/value_enum.rs b/clap_derive/src/derives/value_enum.rs
@@ -84,7 +84,7 @@ fn lits(
                 None
             } else {
                 if !matches!(variant.fields, Fields::Unit) {
-                    abort!(variant.span(), "`#[derive(ValueEnum)]` only supports non-unit variants, unless they are skipped");
+                    abort!(variant.span(), "`#[derive(ValueEnum)]` only supports unit variants. Non-unit variants must be skipped");
                 }
                 let fields = attrs.field_methods(false);
                 let name = attrs.cased_name();

diff --git a/tests/derive_ui/value_enum_non_unit.stderr b/tests/derive_ui/value_enum_non_unit.stderr
@@ -1,4 +1,4 @@
-error: `#[derive(ValueEnum)]` only supports non-unit variants, unless they are skipped
+error: `#[derive(ValueEnum)]` only supports unit variants. Non-unit variants must be skipped
  --> tests/derive_ui/value_enum_non_unit.rs:5:5
   |
 5 |     Foo(usize),