diff options
| author | Zalathar <Zalathar@users.noreply.github.com> | 2023-06-26 22:40:54 +1000 |
|---|---|---|
| committer | Zalathar <Zalathar@users.noreply.github.com> | 2023-06-27 12:51:42 +1000 |
| commit | fbb2079a2410ccb067f7cb99f3ca3ebaccc543c4 (patch) | |
| tree | 70ee600567eb4f664b0e31245422f6bd8438930f | |
| parent | 2a15bdaaa1e62a36ff2748939e2e134035f8ce6e (diff) | |
| download | rust-fbb2079a2410ccb067f7cb99f3ca3ebaccc543c4.tar.gz rust-fbb2079a2410ccb067f7cb99f3ca3ebaccc543c4.zip | |
Use `CoverageKind::as_operand_id` instead of manually reimplementing it
| -rw-r--r-- | compiler/rustc_mir_transform/src/coverage/debug.rs | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/compiler/rustc_mir_transform/src/coverage/debug.rs b/compiler/rustc_mir_transform/src/coverage/debug.rs index 6a3d42511ac..7ad98144159 100644 --- a/compiler/rustc_mir_transform/src/coverage/debug.rs +++ b/compiler/rustc_mir_transform/src/coverage/debug.rs @@ -277,14 +277,7 @@ impl DebugCounters { pub fn add_counter(&mut self, counter_kind: &CoverageKind, some_block_label: Option<String>) { if let Some(counters) = &mut self.some_counters { - let id: ExpressionOperandId = match *counter_kind { - CoverageKind::Counter { id, .. } => id.into(), - CoverageKind::Expression { id, .. } => id.into(), - _ => bug!( - "the given `CoverageKind` is not an counter or expression: {:?}", - counter_kind - ), - }; + let id = counter_kind.as_operand_id(); counters .try_insert(id, DebugCounter::new(counter_kind.clone(), some_block_label)) .expect("attempt to add the same counter_kind to DebugCounters more than once"); @@ -330,13 +323,7 @@ impl DebugCounters { } } - let id: ExpressionOperandId = match *counter_kind { - CoverageKind::Counter { id, .. } => id.into(), - CoverageKind::Expression { id, .. } => id.into(), - _ => { - bug!("the given `CoverageKind` is not an counter or expression: {:?}", counter_kind) - } - }; + let id = counter_kind.as_operand_id(); if self.some_counters.is_some() && (counter_format.block || !counter_format.id) { let counters = self.some_counters.as_ref().unwrap(); if let Some(DebugCounter { some_block_label: Some(block_label), .. }) = |