Auto merge of rust-lang#11218 - MrNossiom:master, r=Manishearth

bors · bors · commit 867e0ec0249b · 2023-07-24T21:26:56.000Z
changelog: [`min_ident_chars`]: don't lint const generics Fixes: rust-lang#11163 changelog: [`min_ident_chars`]: don't lint const generics
diff --git a/clippy_lints/src/min_ident_chars.rs b/clippy_lints/src/min_ident_chars.rs
@@ -129,6 +129,14 @@ impl Visitor<'_> for IdentVisitor<'_, '_> {
                 return;
             }
 
+            // `struct Array<T, const N: usize>([T; N])`
+            //                        ^
+            if let Node::GenericParam(generic_param) = node
+                && let GenericParamKind::Const { .. } = generic_param.kind
+            {
+                return;
+            }
+
             if is_from_proc_macro(cx, &ident) {
                 return;
             }
diff --git a/tests/ui/min_ident_chars.rs b/tests/ui/min_ident_chars.rs
@@ -81,3 +81,7 @@ fn b() {}
 fn wrong_pythagoras(a: f32, b: f32) -> f32 {
     a * a + a * b
 }
+
+mod issue_11163 {
+    struct Array<T, const N: usize>([T; N]);
+}

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,14 @@ impl Visitor<'_> for IdentVisitor<'_, '_> {`
`129`	`129`	`return;`
`130`	`130`	`}`
`131`	`131`
	`132`	+ // `struct Array<T, const N: usize>([T; N])`
	`133`	`+ // ^`
	`134`	`+ if let Node::GenericParam(generic_param) = node`
	`135`	`+ && let GenericParamKind::Const { .. } = generic_param.kind`
	`136`	`+ {`
	`137`	`+ return;`
	`138`	`+ }`
	`139`	`+`
`132`	`140`	`if is_from_proc_macro(cx, &ident) {`
`133`	`141`	`return;`
`134`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,3 +81,7 @@ fn b() {}`
`81`	`81`	`fn wrong_pythagoras(a: f32, b: f32) -> f32 {`
`82`	`82`	`a * a + a * b`
`83`	`83`	`}`
	`84`	`+`
	`85`	`+mod issue_11163 {`
	`86`	`+ struct Array<T, const N: usize>([T; N]);`
	`87`	`+}`