mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix extra non_snake_case warning for shorthand field bindings

Browse Source
This commit is contained in:
Fabian Wolff 2021-10-02 22:18:11 +02:00
parent edebf77e00
commit 9626f2bd84
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/rustc_lint/src/nonstandard_style.rs
View File

@ -437,12 +437,13 @@ fn check_pat(&mut self, cx: &LateContext<'_>, p: &hir::Pat<'_>) {
if let hir::Node::Pat(parent_pat) = cx.tcx.hir().get(cx.tcx.hir().get_parent_node(hid))
{
if let PatKind::Struct(_, field_pats, _) = &parent_pat.kind {
for field in field_pats.iter() {
if field.ident != ident {
// Only check if a new name has been introduced, to avoid warning
// on both the struct definition and this pattern.
self.check_snake_case(cx, "variable", &ident);
}
if field_pats
.iter()
.any(|field| !field.is_shorthand && field.pat.hir_id == p.hir_id)
{
// Only check if a new name has been introduced, to avoid warning
// on both the struct definition and this pattern.
self.check_snake_case(cx, "variable", &ident);
}
return;
}

20
src/test/ui/lint/issue-89469.rs Normal file
View File

@ -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() {}