bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #82506 - estebank:unused_variable_lint, r=lcnr

Browse source 
Properly account for non-shorthand pattern field in unused variable lint

Fix #82488
This commit is contained in:
Guillaume Gomez 2021-02-26 15:52:33 +01:00 • committed by GitHub
commit 75959fb356
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 56 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_passes/src/liveness.rs
View file

@ -367,12 +367,17 @@ impl<'tcx> Visitor<'tcx> for IrMaps<'tcx> {
}
fn visit_param(&mut self, param: &'tcx hir::Param<'tcx>) {
let is_shorthand = matches!(param.pat.kind, rustc_hir::PatKind::Struct(..));
param.pat.each_binding(|_bm, hir_id, _x, ident| {
let var = if is_shorthand {
Local(LocalInfo { id: hir_id, name: ident.name, is_shorthand: true })
} else {
Param(hir_id, ident.name)
let var = match param.pat.kind {
rustc_hir::PatKind::Struct(_, fields, _) => Local(LocalInfo {
id: hir_id,
name: ident.name,
is_shorthand: fields
.iter()
.find(|f| f.ident == ident)
.map_or(false, |f| f.is_shorthand),
}),
_ => Param(hir_id, ident.name),
};
self.add_variable(var);
});