Skip to content

Commit f5b1ba6

Browse files
arielb1Ariel Ben-Yehuda
authored and
Ariel Ben-Yehuda
committed
use the type name as the pass name
1 parent 065a264 commit f5b1ba6

File tree

13 files changed

+12
-27
lines changed

13 files changed

+12
-27
lines changed

src/librustc/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#![feature(box_syntax)]
2929
#![feature(collections)]
3030
#![feature(const_fn)]
31+
#![feature(core_intrinsics)]
3132
#![feature(enumset)]
3233
#![feature(iter_arith)]
3334
#![feature(libc)]

src/librustc/mir/transform.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ pub trait Pass {
7676
fn dep_node(&self, def_id: DefId) -> DepNode<DefId> {
7777
DepNode::MirPass(def_id)
7878
}
79-
fn name(&self) -> &str;
79+
fn name(&self) -> &str {
80+
unsafe { ::std::intrinsics::type_name::<Self>() }
81+
}
8082
fn disambiguator<'a>(&'a self) -> Option<Box<fmt::Display+'a>> { None }
8183
}
8284

src/librustc_borrowck/borrowck/mir/elaborate_drops.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,7 @@ impl<'tcx> MirPass<'tcx> for ElaborateDrops {
6969
}
7070
}
7171

72-
impl Pass for ElaborateDrops {
73-
fn name(&self) -> &str { "elaborate-drops" }
74-
}
72+
impl Pass for ElaborateDrops {}
7573

7674
struct InitializationData {
7775
live: IdxSetBuf<MovePathIndex>,

src/librustc_driver/driver.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1059,7 +1059,7 @@ pub fn phase_4_translate_to_llvm<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
10591059
passes.push_pass(box mir::transform::simplify_cfg::SimplifyCfg::new("elaborate-drops"));
10601060

10611061
passes.push_pass(box mir::transform::add_call_guards::AddCallGuards);
1062-
passes.push_pass(box mir::transform::dump_mir::Marker("pre-trans"));
1062+
passes.push_pass(box mir::transform::dump_mir::Marker("PreTrans"));
10631063

10641064
passes.run_passes(tcx, &mut mir_map);
10651065
});

src/librustc_mir/transform/add_call_guards.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,4 @@ impl<'tcx> MirPass<'tcx> for AddCallGuards {
8282
}
8383
}
8484

85-
impl Pass for AddCallGuards {
86-
fn name(&self) -> &str { "add-call-guards" }
87-
}
85+
impl Pass for AddCallGuards {}

src/librustc_mir/transform/dump_mir.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,4 @@ impl<'tcx> MirPassHook<'tcx> for DumpMir {
7070
}
7171
}
7272

73-
impl<'b> Pass for DumpMir {
74-
fn name(&self) -> &str { "dump-mir" }
75-
}
73+
impl<'b> Pass for DumpMir {}

src/librustc_mir/transform/erase_regions.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ impl<'a, 'tcx> MutVisitor<'tcx> for EraseRegionsVisitor<'a, 'tcx> {
4343

4444
pub struct EraseRegions;
4545

46-
impl Pass for EraseRegions {
47-
fn name(&self) -> &str { "erase-regions" }
48-
}
46+
impl Pass for EraseRegions {}
4947

5048
impl<'tcx> MirPass<'tcx> for EraseRegions {
5149
fn run_pass<'a>(&mut self, tcx: TyCtxt<'a, 'tcx, 'tcx>,

src/librustc_mir/transform/no_landing_pads.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,4 @@ impl<'tcx> MirPass<'tcx> for NoLandingPads {
5050
}
5151
}
5252

53-
impl Pass for NoLandingPads {
54-
fn name(&self) -> &str { "no-landing-pads" }
55-
}
53+
impl Pass for NoLandingPads {}

src/librustc_mir/transform/qualify_consts.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -906,9 +906,7 @@ fn qualify_const_item_cached<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
906906

907907
pub struct QualifyAndPromoteConstants;
908908

909-
impl Pass for QualifyAndPromoteConstants {
910-
fn name(&self) -> &str { "qualify-consts" }
911-
}
909+
impl Pass for QualifyAndPromoteConstants {}
912910

913911
impl<'tcx> MirMapPass<'tcx> for QualifyAndPromoteConstants {
914912
fn run_pass<'a>(&mut self,

src/librustc_mir/transform/simplify_branches.rs

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ impl<'l, 'tcx> MirPass<'tcx> for SimplifyBranches<'l> {
5757
}
5858

5959
impl<'l> Pass for SimplifyBranches<'l> {
60-
fn name(&self) -> &str { "simplify-branches" }
6160
fn disambiguator<'a>(&'a self) -> Option<Box<fmt::Display+'a>> {
6261
Some(Box::new(self.label))
6362
}

src/librustc_mir/transform/simplify_cfg.rs

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ impl<'l, 'tcx> MirPass<'tcx> for SimplifyCfg<'l> {
5959
}
6060

6161
impl<'l> Pass for SimplifyCfg<'l> {
62-
fn name(&self) -> &str { "simplify-cfg" }
6362
fn disambiguator<'a>(&'a self) -> Option<Box<fmt::Display+'a>> {
6463
Some(Box::new(self.label))
6564
}

src/librustc_mir/transform/type_check.rs

-2
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,4 @@ impl Pass for TypeckMir {
717717
fn dep_node(&self, def_id: DefId) -> DepNode<DefId> {
718718
DepNode::MirTypeck(def_id)
719719
}
720-
721-
fn name(&self) -> &str { "typeck-mir" }
722720
}

src/test/run-pass-fulldeps/auxiliary/dummy_mir_pass.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ use rustc_plugin::Registry;
2828

2929
struct Pass;
3030

31-
impl transform::Pass for Pass {
32-
fn name(&self) -> &str { "dummy-mir-pass" }
33-
}
31+
impl transform::Pass for Pass {}
3432

3533
impl<'tcx> MirPass<'tcx> for Pass {
3634
fn run_pass<'a>(&mut self, _: TyCtxt<'a, 'tcx, 'tcx>,

0 commit comments

Comments
 (0)