Skip to content

Commit 6f29a3c

Browse files
committed
nit: consistent naming for SimplifyConstCondition
1 parent fa4cc63 commit 6f29a3c

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

compiler/rustc_mir_transform/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -507,12 +507,12 @@ fn run_optimization_passes<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
507507
//
508508
// Const-prop runs unconditionally, but doesn't mutate the MIR at mir-opt-level=0.
509509
&const_debuginfo::ConstDebugInfo,
510-
&o1(simplify_branches::SimplifyConstConditionPassName::AfterConstProp),
510+
&o1(simplify_branches::SimplifyConstCondition::AfterConstProp),
511511
&early_otherwise_branch::EarlyOtherwiseBranch,
512512
&simplify_comparison_integral::SimplifyComparisonIntegral,
513513
&dead_store_elimination::DeadStoreElimination,
514514
&dest_prop::DestinationPropagation,
515-
&o1(simplify_branches::SimplifyConstConditionPassName::Final),
515+
&o1(simplify_branches::SimplifyConstCondition::Final),
516516
&o1(remove_noop_landing_pads::RemoveNoopLandingPads),
517517
&o1(simplify::SimplifyCfg::Final),
518518
&nrvo::RenameReturnPlace,

compiler/rustc_mir_transform/src/simplify_branches.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@ use crate::MirPass;
22
use rustc_middle::mir::*;
33
use rustc_middle::ty::TyCtxt;
44

5-
pub enum SimplifyConstConditionPassName {
5+
pub enum SimplifyConstCondition {
66
AfterConstProp,
77
Final,
88
}
99
/// A pass that replaces a branch with a goto when its condition is known.
10-
impl<'tcx> MirPass<'tcx> for SimplifyConstConditionPassName {
10+
impl<'tcx> MirPass<'tcx> for SimplifyConstCondition {
1111
fn name(&self) -> &'static str {
1212
match self {
13-
SimplifyConstConditionPassName::AfterConstProp => {
14-
"SimplifyConstCondition-after-const-prop"
15-
}
16-
SimplifyConstConditionPassName::Final => "SimplifyConstCondition-final",
13+
SimplifyConstCondition::AfterConstProp => "SimplifyConstCondition-after-const-prop",
14+
SimplifyConstCondition::Final => "SimplifyConstCondition-final",
1715
}
1816
}
1917

0 commit comments

Comments
 (0)