bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fix #105028, Only suggest removing struct field from destructive binding in shorthand scenario

Browse source
This commit is contained in:
yukang 2022-12-01 02:21:48 +08:00
parent 41e0363055
commit 0e24cee063
3 changed files with 37 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1548,7 +1548,13 @@ impl<'tcx> Liveness<'_, 'tcx> {
.or_insert_with(|| (ln, var, vec![id_and_sp]));
});
let can_remove = matches!(&pat.kind, hir::PatKind::Struct(_, _, true));
let can_remove = match pat.kind {
hir::PatKind::Struct(_, fields, true) => {
// if all fields are shorthand, remove the struct field, otherwise, mark with _ as prefix
fields.iter().all(|f| f.is_shorthand)
}
_ => false,
};
for (_, (ln, var, hir_ids_and_spans)) in vars {
if self.used_on_entry(ln, var) {