bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix rebase fallout

Browse source
This commit is contained in:
Jonas Schievink 2020-09-12 15:18:50 +02:00
parent 7af964fecf
commit cd5d7201ad
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_mir/src/transform/dest_prop.rs
View file

@ -588,11 +588,12 @@ impl Conflicts<'a> {
} }
StatementKind::SetDiscriminant { .. } StatementKind::SetDiscriminant { .. }
| StatementKind::StorageLive(_) | StatementKind::StorageLive(..)
| StatementKind::StorageDead(_) | StatementKind::StorageDead(..)
| StatementKind::Retag(_, _) | StatementKind::Retag(..)
| StatementKind::FakeRead(_, _) | StatementKind::FakeRead(..)
| StatementKind::AscribeUserType(_, _) | StatementKind::AscribeUserType(..)
| StatementKind::Coverage(..)
| StatementKind::Nop => {} | StatementKind::Nop => {}
} }
} }