bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Put new bindings first in refutable cases too

Browse source
This commit is contained in:
Nadrieril 2024-01-21 23:36:33 +01:00
parent e902878908
commit 09d4613f20
18 changed files with 230 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_mir_build/src/build/matches/simplify.rs
View file

@ -87,7 +87,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
// let z = (x as Variant).copy_field;
// // and raises an error
// }
let mut original_bindings = mem::take(&mut candidate.bindings);
let original_bindings = mem::take(&mut candidate.bindings);
let mut new_bindings = Vec::new();
// Repeatedly simplify match pairs until fixed point is reached
loop {
@ -115,9 +115,9 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
}
// Restore original bindings and append the new ones.
// This does: candidate.bindings = original_bindings ++ new_bindings
mem::swap(&mut candidate.bindings, &mut original_bindings);
candidate.bindings.extend_from_slice(&new_bindings);
// This does: candidate.bindings = new_bindings ++ original_bindings
mem::swap(&mut candidate.bindings, &mut new_bindings);
candidate.bindings.extend_from_slice(&original_bindings);
let did_expand_or =
if let [MatchPair { pattern: Pat { kind: PatKind::Or { pats }, .. }, place }] =