bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

simplify_try: address some of eddyb's comments

Browse source
This commit is contained in:
Mazdak Farrokhzad 2020-02-11 10:14:50 +01:00
parent dc4242d905
commit ebbaf4611a
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/librustc_mir/transform/simplify_try.rs
View file

@ -52,6 +52,8 @@ impl<'tcx> MirPass<'tcx> for SimplifyArmIdentity {
Some(x) => x,
};
if local_tmp_s0 != local_tmp_s1
// Avoid moving into ourselves.
|| local_0 == local_1
// The field-and-variant information match up.
|| vf_s0 != vf_s1
// Source and target locals have the same type.
@ -64,6 +66,7 @@ impl<'tcx> MirPass<'tcx> for SimplifyArmIdentity {
}
// Right shape; transform!
s0.source_info = s2.source_info;
match &mut s0.kind {
StatementKind::Assign(box (place, rvalue)) => {
*place = local_0.into();