From 320331fe35f4020b388b2ccc5128d7261473ea08 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 12 Sep 2012 11:22:48 -0700
Subject: [PATCH] Use a different strategy for transitioning to camel case
 extfmt

---
 src/libcore/extfmt.rs    | 7 ++-----
 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 e7b1ec517ec4..10c9547b2174 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 4c5435d11236..f34679426abd 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 {