Skip to content

Commit f4709e6

Browse files
committed
Auto merge of rust-lang#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 rust-lang#8324
2 parents 8bb4690 + 7c56317 commit f4709e6

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

clippy_lints/src/enum_variants.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,9 @@ fn check_variant(cx: &LateContext<'_>, threshold: u64, def: &EnumDef<'_>, item_n
172172
let name = var.ident.name.as_str();
173173

174174
let variant_split = camel_case_split(name);
175+
if variant_split.len() == 1 {
176+
return;
177+
}
175178

176179
pre = pre
177180
.iter()

tests/ui/enum_variants.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,4 +151,11 @@ enum North {
151151
NoRight,
152152
}
153153

154+
// #8324
155+
enum Phase {
156+
PreLookup,
157+
Lookup,
158+
PostLookup,
159+
}
160+
154161
fn main() {}

0 commit comments

Comments
 (0)