Rollup merge of #76523 - tmiasko:non-use-context-coverage, r=wesleywiser

tmandry · web-flow · commit 32714eb6bc3c · 2020-09-09T15:06:07.000-07:00
Remove unused PlaceContext::NonUse(NonUseContext::Coverage) r? @richkadel / @wesleywiser
diff --git a/compiler/rustc_middle/src/mir/visit.rs b/compiler/rustc_middle/src/mir/visit.rs
@@ -1150,8 +1150,6 @@ pub enum NonUseContext {
     StorageDead,
     /// User type annotation assertions for NLL.
     AscribeUserTy,
-    /// Coverage code region and counter metadata.
-    Coverage,
     /// The data of an user variable, for debug info.
     VarDebugInfo,
 }
diff --git a/compiler/rustc_mir/src/borrow_check/def_use.rs b/compiler/rustc_mir/src/borrow_check/def_use.rs
@@ -72,8 +72,7 @@ pub fn categorize(context: PlaceContext) -> Option<DefUse> {
         PlaceContext::MutatingUse(MutatingUseContext::Drop) =>
             Some(DefUse::Drop),
 
-        // Coverage and debug info are neither def nor use.
-        PlaceContext::NonUse(NonUseContext::Coverage) |
+        // Debug info is neither def nor use.
         PlaceContext::NonUse(NonUseContext::VarDebugInfo) => None,
     }
 }
diff --git a/compiler/rustc_mir/src/dataflow/impls/init_locals.rs b/compiler/rustc_mir/src/dataflow/impls/init_locals.rs
@@ -97,7 +97,6 @@ where
             PlaceContext::NonUse(
                 NonUseContext::StorageLive
                 | NonUseContext::AscribeUserTy
-                | NonUseContext::Coverage
                 | NonUseContext::VarDebugInfo,
             )
             | PlaceContext::NonMutatingUse(

Original file line number	Diff line number	Diff line change
`@@ -1150,8 +1150,6 @@ pub enum NonUseContext {`
`1150`	`1150`	`StorageDead,`
`1151`	`1151`	`/// User type annotation assertions for NLL.`
`1152`	`1152`	`AscribeUserTy,`
`1153`		`- /// Coverage code region and counter metadata.`
`1154`		`- Coverage,`
`1155`	`1153`	`/// The data of an user variable, for debug info.`
`1156`	`1154`	`VarDebugInfo,`
`1157`	`1155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,7 @@ pub fn categorize(context: PlaceContext) -> Option<DefUse> {`
`72`	`72`	`PlaceContext::MutatingUse(MutatingUseContext::Drop) =>`
`73`	`73`	`Some(DefUse::Drop),`
`74`	`74`
`75`		`- // Coverage and debug info are neither def nor use.`
`76`		`- PlaceContext::NonUse(NonUseContext::Coverage) \|`
	`75`	`+ // Debug info is neither def nor use.`
`77`	`76`	`PlaceContext::NonUse(NonUseContext::VarDebugInfo) => None,`
`78`	`77`	`}`
`79`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,6 @@ where`
`97`	`97`	`PlaceContext::NonUse(`
`98`	`98`	`NonUseContext::StorageLive`
`99`	`99`	`\| NonUseContext::AscribeUserTy`
`100`		`- \| NonUseContext::Coverage`
`101`	`100`	`\| NonUseContext::VarDebugInfo,`
`102`	`101`	`)`
`103`	`102`	`\| PlaceContext::NonMutatingUse(`