From d29962f0eb2772c208a299efae86ad16bc25f7de Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 23 Oct 2012 14:20:57 -0700
Subject: [PATCH] Move futures to std

---
 src/libcore/core.rc                       | 1 -
 src/{libcore => libstd}/future.rs         | 0
 src/libstd/std.rc                         | 1 +
 src/rustdoc/markdown_writer.rs            | 1 +
 src/test/bench/msgsend-ring-mutex-arcs.rs | 3 +--
 src/test/bench/msgsend-ring-pipes.rs      | 3 +--
 src/test/bench/msgsend-ring-rw-arcs.rs    | 3 +--
 src/test/bench/msgsend-ring.rs            | 2 +-
 8 files changed, 6 insertions(+), 8 deletions(-)
 rename src/{libcore => libstd}/future.rs (100%)

diff --git a/src/libcore/core.rc b/src/libcore/core.rc
index 9ebdad3521e..c0852e66320 100644
--- a/src/libcore/core.rc
+++ b/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/src/libcore/future.rs b/src/libstd/future.rs
similarity index 100%
rename from src/libcore/future.rs
rename to src/libstd/future.rs
diff --git a/src/libstd/std.rc b/src/libstd/std.rc
index bbffde40948..0c48cd7ce00 100644
--- a/src/libstd/std.rc
+++ b/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/src/rustdoc/markdown_writer.rs b/src/rustdoc/markdown_writer.rs
index 1ed007def63..99185fb15bf 100644
--- a/src/rustdoc/markdown_writer.rs
+++ b/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/src/test/bench/msgsend-ring-mutex-arcs.rs b/src/test/bench/msgsend-ring-mutex-arcs.rs
index ac0043b7309..82b8e2410a9 100644
--- a/src/test/bench/msgsend-ring-mutex-arcs.rs
+++ b/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/src/test/bench/msgsend-ring-pipes.rs b/src/test/bench/msgsend-ring-pipes.rs
index 85e46bfcaec..de4332b692a 100644
--- a/src/test/bench/msgsend-ring-pipes.rs
+++ b/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/src/test/bench/msgsend-ring-rw-arcs.rs b/src/test/bench/msgsend-ring-rw-arcs.rs
index f5c6a49a364..375ff8f50d8 100644
--- a/src/test/bench/msgsend-ring-rw-arcs.rs
+++ b/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/src/test/bench/msgsend-ring.rs b/src/test/bench/msgsend-ring.rs
index 5cb278b0dd2..343f50127b5 100644
--- a/src/test/bench/msgsend-ring.rs
+++ b/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,