diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-09-12 11:22:48 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-09-12 11:22:48 -0700 |
| commit | 320331fe35f4020b388b2ccc5128d7261473ea08 (patch) | |
| tree | 7b7edd6cc02f5d6a7c1740bd0812e87950a44412 | |
| parent | 2eef6658c3e949e17dae115c95c7686105184017 (diff) | |
| download | rust-320331fe35f4020b388b2ccc5128d7261473ea08.tar.gz rust-320331fe35f4020b388b2ccc5128d7261473ea08.zip | |
Use a different strategy for transitioning to camel case extfmt
| -rw-r--r-- | src/libcore/extfmt.rs | 7 | ||||
| -rw-r--r-- | src/libsyntax/ext/fmt.rs | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/libcore/extfmt.rs b/src/libcore/extfmt.rs index e7b1ec517ec..10c9547b217 100644 --- a/src/libcore/extfmt.rs +++ b/src/libcore/extfmt.rs @@ -273,10 +273,8 @@ mod ct { // decisions made a runtime. If it proves worthwhile then some of these // conditions can be evaluated at compile-time. For now though it's cleaner to // implement it 0this way, I think. -#[cfg(stage1)] -#[cfg(stage2)] -#[cfg(stage3)] -mod rt { +// XXX Rename to rt after snapshot +mod rt2 { const flag_none : u32 = 0u32; const flag_left_justify : u32 = 0b00000000000000000000000000000001u32; const flag_left_zero_pad : u32 = 0b00000000000000000000000000000010u32; @@ -464,7 +462,6 @@ mod rt { } // XXX remove after snappies -#[cfg(stage0)] #[allow(non_camel_case_types)] mod rt { const flag_none : u32 = 0u32; diff --git a/src/libsyntax/ext/fmt.rs b/src/libsyntax/ext/fmt.rs index 4c5435d1123..f34679426ab 100644 --- a/src/libsyntax/ext/fmt.rs +++ b/src/libsyntax/ext/fmt.rs @@ -39,7 +39,7 @@ fn pieces_to_expr(cx: ext_ctxt, sp: span, -> @ast::expr { fn make_path_vec(_cx: ext_ctxt, ident: @~str) -> ~[ast::ident] { let intr = _cx.parse_sess().interner; - return ~[intr.intern(@~"extfmt"), intr.intern(@~"rt"), + return ~[intr.intern(@~"extfmt"), intr.intern(@~"rt2"), intr.intern(ident)]; } fn make_rt_path_expr(cx: ext_ctxt, sp: span, nm: @~str) -> @ast::expr { |