---

yaml
---
r: 47869
b: refs/heads/incoming
c: ab784b7
h: refs/heads/master
i:
  47867: 91c3d02
v: v3

Author: bors

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 9dae4cf1f0f2fd82ee653d89abc46d349b6e6caa
+refs/heads/incoming: ab784b7de522c358e682e00c3a01d44d32c56943
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/core.rc

@@ -225,6 +225,8 @@ pub const debug : u32 = 4_u32;
 // The runtime interface used by the compiler
 #[cfg(notest)] pub mod rt;
 // The runtime and compiler interface to fmt!
+#[cfg(stage0)]
+#[path = "private/extfmt.rs"]
 pub mod extfmt;
 // Private APIs
 pub mod private;

branches/incoming/src/libcore/prelude.rs

@@ -52,7 +52,6 @@ pub use char;
 pub use cmp;
 pub use dvec;
 pub use either;
-pub use extfmt;
 pub use f32;
 pub use f64;
 pub use float;

branches/incoming/src/libcore/private.rs

@@ -34,6 +34,8 @@ pub mod weak_task;
 pub mod exchange_alloc;
 #[path = "private/intrinsics.rs"]
 pub mod intrinsics;
+#[path = "private/extfmt.rs"]
+pub mod extfmt;
 
 extern mod rustrt {
     pub unsafe fn rust_create_little_lock() -> rust_little_lock;
@@ -493,7 +495,7 @@ pub mod tests {
         res.recv();
     }
 
-    #[test] #[should_fail] #[ignore(cfg(windows))]
+    #[test] #[should_fail] #[ignore(reason = "random red")]
     pub fn exclusive_unwrap_conflict() {
         let x = exclusive(~~"hello");
         let x2 = ~mut Some(x.clone());
@@ -505,8 +507,7 @@ pub mod tests {
         }
         assert unwrap_exclusive(x) == ~~"hello";
         let res = option::swap_unwrap(&mut res);
-        // See #4689 for why this can't be just "res.recv()".
-        assert res.recv() == task::Success;
+        res.recv();
     }
 
     #[test] #[ignore(cfg(windows))]

branches/incoming/src/libcore/extfmt.rs renamed to branches/incoming/src/libcore/private/extfmt.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);