bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Consistently merge simplifiable or-patterns

Browse source
This commit is contained in:
Nadrieril 2024-03-05 21:52:40 +01:00
parent 08d7379961
commit d1d9aa3108
2 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_mir_build/src/build/matches/mod.rs
View file

@ -1293,8 +1293,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
// At least one of the candidates has been split into subcandidates.
// We need to change the candidate list to include those.
let mut new_candidates = Vec::new();
for candidate in candidates {
for candidate in candidates.iter_mut() {
candidate.visit_leaves(|leaf_candidate| new_candidates.push(leaf_candidate));
}
self.match_simplified_candidates(
@ -1304,6 +1303,10 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
otherwise_block,
&mut *new_candidates,
);
for candidate in candidates {
self.merge_trivial_subcandidates(candidate);
}
} else {
self.match_simplified_candidates(
span,