about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-01-21 13:37:18 +0000
committerbors <bors@rust-lang.org>2022-01-21 13:37:18 +0000
commitf4709e6f1d57f13a44fc2654f7e0fb7968b20d4b (patch)
tree578b53aaa42658e07dcdd2b40cde7cde3a203f19
parent8bb4690487a39f9faab77b308bd797a15c216703 (diff)
parent7c563175c7b2e7eeb2a917707c09236b77321946 (diff)
downloadrust-f4709e6f1d57f13a44fc2654f7e0fb7968b20d4b.tar.gz
rust-f4709e6f1d57f13a44fc2654f7e0fb7968b20d4b.zip
Auto merge of #8329 - Alexendoo:enum-variant-names, r=giraffate
Don't suggest an empty variant name in `enum_variant_names`

changelog: false positive fix: [`enum_variant_names`]: No longer suggests an empty variant name

Fixes #8324
-rw-r--r--clippy_lints/src/enum_variants.rs3
-rw-r--r--tests/ui/enum_variants.rs7
2 files changed, 10 insertions, 0 deletions
diff --git a/clippy_lints/src/enum_variants.rs b/clippy_lints/src/enum_variants.rs
index 4f89e567430..1f4353fa4f7 100644
--- a/clippy_lints/src/enum_variants.rs
+++ b/clippy_lints/src/enum_variants.rs
@@ -172,6 +172,9 @@ fn check_variant(cx: &LateContext<'_>, threshold: u64, def: &EnumDef<'_>, item_n
         let name = var.ident.name.as_str();
 
         let variant_split = camel_case_split(name);
+        if variant_split.len() == 1 {
+            return;
+        }
 
         pre = pre
             .iter()
diff --git a/tests/ui/enum_variants.rs b/tests/ui/enum_variants.rs
index d3662a0a213..b2bf7c4e360 100644
--- a/tests/ui/enum_variants.rs
+++ b/tests/ui/enum_variants.rs
@@ -151,4 +151,11 @@ enum North {
     NoRight,
 }
 
+// #8324
+enum Phase {
+    PreLookup,
+    Lookup,
+    PostLookup,
+}
+
 fn main() {}