Skip to content

Commit d29962f

Browse files
committed
Move futures to std
1 parent f500f3f commit d29962f

File tree

8 files changed

+6
-8
lines changed

8 files changed

+6
-8
lines changed

Diff for: src/libcore/core.rc

-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ pub mod task {
181181
pub mod spawn;
182182
pub mod rt;
183183
}
184-
pub mod future;
185184
pub mod pipes;
186185

187186
// Runtime and language-primitive support
File renamed without changes.

Diff for: src/libstd/std.rc

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ pub mod cell;
5353
pub mod sync;
5454
pub mod arc;
5555
pub mod comm;
56+
pub mod future;
5657

5758
// Collections
5859

Diff for: src/rustdoc/markdown_writer.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use doc::ItemUtils;
22
use io::ReaderUtil;
3+
use std::future;
34

45
export WriteInstr;
56
export Writer;

Diff for: src/test/bench/msgsend-ring-mutex-arcs.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77

88
// xfail-pretty
99

10-
use future::future;
11-
1210
extern mod std;
1311
use std::time;
1412
use std::arc;
13+
use std::future;
1514

1615
// A poor man's pipe.
1716
type pipe = arc::MutexARC<~[uint]>;

Diff for: src/test/bench/msgsend-ring-pipes.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88

99
// xfail-pretty
1010

11-
use future::future;
12-
1311
extern mod std;
1412
use std::time;
13+
use std::future;
1514

1615
use pipes::recv;
1716

Diff for: src/test/bench/msgsend-ring-rw-arcs.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77

88
// xfail-pretty
99

10-
use future::future;
11-
1210
extern mod std;
1311
use std::time;
1412
use std::arc;
13+
use std::future;
1514

1615
// A poor man's pipe.
1716
type pipe = arc::RWARC<~[uint]>;

Diff for: src/test/bench/msgsend-ring.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
// message path.
66

77
use comm::*;
8-
use future::future;
98

109
extern mod std;
1110
use std::time;
11+
use std::future;
1212

1313
fn thread_ring(i: uint,
1414
count: uint,

0 commit comments

Comments
 (0)