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

Use Pat::walk_always instead of manual walk

Browse Source
This commit is contained in:
Nilstrieb 2023-12-28 22:18:18 +01:00
parent 3ee6710954
commit 8fe4d0d156
1 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
compiler/rustc_passes/src/liveness.rs
View File

@ -101,7 +101,6 @@ use rustc_span::symbol::{kw, sym, Symbol};
use rustc_span::DUMMY_SP; use rustc_span::DUMMY_SP;
use rustc_span::{BytePos, Span}; use rustc_span::{BytePos, Span};
use std::collections::VecDeque;
use std::io; use std::io;
use std::io::prelude::*; use std::io::prelude::*;
use std::rc::Rc; use std::rc::Rc;
@ -317,35 +316,13 @@ impl<'tcx> IrMaps<'tcx> {
// For struct patterns, take note of which fields used shorthand // For struct patterns, take note of which fields used shorthand
// (`x` rather than `x: x`). // (`x` rather than `x: x`).
let mut shorthand_field_ids = HirIdSet::default(); let mut shorthand_field_ids = HirIdSet::default();
let mut pats = VecDeque::new();
pats.push_back(pat);
while let Some(pat) = pats.pop_front() { pat.walk_always(|pat| {
use rustc_hir::PatKind::*; if let hir::PatKind::Struct(_, fields, _) = pat.kind {
match &pat.kind { let short = fields.iter().filter(|f| f.is_shorthand);
Binding(.., inner_pat) => { shorthand_field_ids.extend(short.map(|f| f.pat.hir_id));
pats.extend(inner_pat.iter());
}
Struct(_, fields, _) => {
let (short, not_short): (Vec<hir::PatField<'_>>, _) =
fields.iter().partition(|f| f.is_shorthand);
shorthand_field_ids.extend(short.iter().map(|f| f.pat.hir_id));
pats.extend(not_short.iter().map(|f| f.pat));
}
Ref(inner_pat, _) | Box(inner_pat) => {
pats.push_back(inner_pat);
}
TupleStruct(_, inner_pats, _) | Tuple(inner_pats, _) | Or(inner_pats) => {
pats.extend(inner_pats.iter());
}
Slice(pre_pats, inner_pat, post_pats) => {
pats.extend(pre_pats.iter());
pats.extend(inner_pat.iter());
pats.extend(post_pats.iter());
}
_ => {}
} }
} });
shorthand_field_ids shorthand_field_ids
} }