Fix rebase fallout

jonas-schievink · jonas-schievink · commit cd5d7201ad1e · 2020-09-18T21:23:01.000+02:00
diff --git a/compiler/rustc_mir/src/transform/dest_prop.rs b/compiler/rustc_mir/src/transform/dest_prop.rs
@@ -588,11 +588,12 @@ impl Conflicts<'a> {
             }
 
             StatementKind::SetDiscriminant { .. }
-            | StatementKind::StorageLive(_)
-            | StatementKind::StorageDead(_)
-            | StatementKind::Retag(_, _)
-            | StatementKind::FakeRead(_, _)
-            | StatementKind::AscribeUserType(_, _)
+            | StatementKind::StorageLive(..)
+            | StatementKind::StorageDead(..)
+            | StatementKind::Retag(..)
+            | StatementKind::FakeRead(..)
+            | StatementKind::AscribeUserType(..)
+            | StatementKind::Coverage(..)
             | StatementKind::Nop => {}
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -588,11 +588,12 @@ impl Conflicts<'a> {`
`588`	`588`	`}`
`589`	`589`
`590`	`590`	`StatementKind::SetDiscriminant { .. }`
`591`		`- \| StatementKind::StorageLive(_)`
`592`		`- \| StatementKind::StorageDead(_)`
`593`		`- \| StatementKind::Retag(_, _)`
`594`		`- \| StatementKind::FakeRead(_, _)`
`595`		`- \| StatementKind::AscribeUserType(_, _)`
	`591`	`+ \| StatementKind::StorageLive(..)`
	`592`	`+ \| StatementKind::StorageDead(..)`
	`593`	`+ \| StatementKind::Retag(..)`
	`594`	`+ \| StatementKind::FakeRead(..)`
	`595`	`+ \| StatementKind::AscribeUserType(..)`
	`596`	`+ \| StatementKind::Coverage(..)`
`596`	`597`	`\| StatementKind::Nop => {}`
`597`	`598`	`}`
`598`	`599`	`}`