---

brson · brson · commit 3e70e27e2e1d · 2012-10-23T14:46:49.000-07:00
yaml --- r: 38755 b: refs/heads/incoming c: d29962f h: refs/heads/master i: 38753: 0e84b6b 38751: 311a76a v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: f500f3f1fb4092bf7993170d755377268943e94b
+refs/heads/incoming: d29962f0eb2772c208a299efae86ad16bc25f7de
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/libcore/core.rc b/branches/incoming/src/libcore/core.rc
@@ -181,7 +181,6 @@ pub mod task {
     pub mod spawn;
     pub mod rt;
 }
-pub mod future;
 pub mod pipes;
 
 // Runtime and language-primitive support
diff --git a/branches/incoming/src/libstd/future.rs b/branches/incoming/src/libstd/future.rs
diff --git a/branches/incoming/src/libstd/std.rc b/branches/incoming/src/libstd/std.rc
@@ -53,6 +53,7 @@ pub mod cell;
 pub mod sync;
 pub mod arc;
 pub mod comm;
+pub mod future;
 
 // Collections
 
diff --git a/branches/incoming/src/rustdoc/markdown_writer.rs b/branches/incoming/src/rustdoc/markdown_writer.rs
@@ -1,5 +1,6 @@
 use doc::ItemUtils;
 use io::ReaderUtil;
+use std::future;
 
 export WriteInstr;
 export Writer;
diff --git a/branches/incoming/src/test/bench/msgsend-ring-mutex-arcs.rs b/branches/incoming/src/test/bench/msgsend-ring-mutex-arcs.rs
@@ -7,11 +7,10 @@
 
 // xfail-pretty
 
-use future::future;
-
 extern mod std;
 use std::time;
 use std::arc;
+use std::future;
 
 // A poor man's pipe.
 type pipe = arc::MutexARC<~[uint]>;
diff --git a/branches/incoming/src/test/bench/msgsend-ring-pipes.rs b/branches/incoming/src/test/bench/msgsend-ring-pipes.rs
@@ -8,10 +8,9 @@
 
 // xfail-pretty
 
-use future::future;
-
 extern mod std;
 use std::time;
+use std::future;
 
 use pipes::recv;
 
diff --git a/branches/incoming/src/test/bench/msgsend-ring-rw-arcs.rs b/branches/incoming/src/test/bench/msgsend-ring-rw-arcs.rs
@@ -7,11 +7,10 @@
 
 // xfail-pretty
 
-use future::future;
-
 extern mod std;
 use std::time;
 use std::arc;
+use std::future;
 
 // A poor man's pipe.
 type pipe = arc::RWARC<~[uint]>;
diff --git a/branches/incoming/src/test/bench/msgsend-ring.rs b/branches/incoming/src/test/bench/msgsend-ring.rs
@@ -5,10 +5,10 @@
 // message path.
 
 use comm::*;
-use future::future;
 
 extern mod std;
 use std::time;
+use std::future;
 
 fn thread_ring(i: uint,
                count: uint,

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,6 @@ pub mod task {`
`181`	`181`	`pub mod spawn;`
`182`	`182`	`pub mod rt;`
`183`	`183`	`}`
`184`		`-pub mod future;`
`185`	`184`	`pub mod pipes;`
`186`	`185`
`187`	`186`	`// Runtime and language-primitive support`