about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorJubilee <46493976+workingjubilee@users.noreply.github.com>2021-10-04 21:12:38 -0700
committerGitHub <noreply@github.com>2021-10-04 21:12:38 -0700
commitc2bfe45e660b9c56cb4ef734b30c278bb0414ee7 (patch)
treed0cfbd3edb65545963f9dcc555268bdae177fabc /src
parent36f173f0a93dc3ead3d8be5f160c28cba0637494 (diff)
parent9626f2bd84ccf99635dfdbca3da782db3596190a (diff)
downloadrust-c2bfe45e660b9c56cb4ef734b30c278bb0414ee7.tar.gz
rust-c2bfe45e660b9c56cb4ef734b30c278bb0414ee7.zip
Rollup merge of #89473 - FabianWolff:issue-89469, r=joshtriplett
Fix extra `non_snake_case` warning for shorthand field bindings

Fixes #89469. The problem is the innermost `if` condition here:
https://github.com/rust-lang/rust/blob/d14731cb3ced8318d7fc83cbe838f0e7f2fb3b40/compiler/rustc_lint/src/nonstandard_style.rs#L435-L452

This code runs for every `PatKind::Binding`, so if a struct has multiple fields, say A and B, and both are bound in a pattern using shorthands, the call to `self.check_snake_case()` will indeed be skipped in the `check_pat()` call for `A`; but when `check_pat()` is called for `B`, the loop will still iterate over `A`, and `field.ident (= A) != ident (= B)` will be true. I have fixed this by only looking at non-shorthand bindings, and only the binding that `check_pat()` was actually called for.
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/lint/issue-89469.rs20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/test/ui/lint/issue-89469.rs b/src/test/ui/lint/issue-89469.rs
new file mode 100644
index 00000000000..3a6ab452840
--- /dev/null
+++ b/src/test/ui/lint/issue-89469.rs
@@ -0,0 +1,20 @@
+// Regression test for #89469, where an extra non_snake_case warning was
+// reported for a shorthand field binding.
+
+// check-pass
+#![deny(non_snake_case)]
+
+#[allow(non_snake_case)]
+struct Entry {
+    A: u16,
+    a: u16
+}
+
+fn foo() -> Entry {todo!()}
+
+pub fn f() {
+    let Entry { A, a } = foo();
+    let _ = (A, a);
+}
+
+fn main() {}