about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-02-21 16:42:35 -0800
committerbors <bors@rust-lang.org>2013-02-21 16:42:35 -0800
commitab784b7de522c358e682e00c3a01d44d32c56943 (patch)
tree5660d31622f4e2583184cb6e7d68d0a97971d3a0 /src/libsyntax
parente0767bf24f7a526430472290825ebd9158cb1dcc (diff)
parent3792eb2a3847f7891a7d3a1941aa7833626baa5c (diff)
downloadrust-ab784b7de522c358e682e00c3a01d44d32c56943.tar.gz
rust-ab784b7de522c358e682e00c3a01d44d32c56943.zip
auto merge of #5059 : Kimundi/rust/incoming, r=catamorphism
compiles-as-is, but needs a snapshot to remove the `stage0`ed extfmt export in core.

Closes #4750
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/ext/fmt.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/ext/fmt.rs b/src/libsyntax/ext/fmt.rs
index e1e142d06eb..937bcef5c25 100644
--- a/src/libsyntax/ext/fmt.rs
+++ b/src/libsyntax/ext/fmt.rs
@@ -23,7 +23,7 @@ use codemap::span;
 use ext::base::*;
 use ext::base;
 use ext::build::*;
-use extfmt::ct::*;
+use private::extfmt::ct::*;
 
 pub fn expand_syntax_ext(cx: ext_ctxt, sp: span, tts: ~[ast::token_tree])
     -> base::MacResult {
@@ -56,8 +56,8 @@ 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"),
-                 intr.intern(ident)];
+        return ~[intr.intern(@~"private"), intr.intern(@~"extfmt"),
+                 intr.intern(@~"rt"), intr.intern(ident)];
     }
     fn make_rt_path_expr(cx: ext_ctxt, sp: span, nm: @~str) -> @ast::expr {
         let path = make_path_vec(cx, nm);