---

yaml
---
r: 32554
b: refs/heads/dist-snap
c: 320331f
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 2eef6658c3e949e17dae115c95c7686105184017
+refs/heads/dist-snap: 320331fe35f4020b388b2ccc5128d7261473ea08
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/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;

branches/dist-snap/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 {