Skip to content

Commit

Permalink
Move futures to std
Browse files Browse the repository at this point in the history
  • Loading branch information
brson committed Oct 23, 2012
1 parent f500f3f commit d29962f
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 8 deletions.
1 change: 0 additions & 1 deletion src/libcore/core.rc
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ pub mod task {
pub mod spawn;
pub mod rt;
}
pub mod future;
pub mod pipes;

// Runtime and language-primitive support
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions src/libstd/std.rc
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ pub mod cell;
pub mod sync;
pub mod arc;
pub mod comm;
pub mod future;

// Collections

Expand Down
1 change: 1 addition & 0 deletions src/rustdoc/markdown_writer.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use doc::ItemUtils;
use io::ReaderUtil;
use std::future;

export WriteInstr;
export Writer;
Expand Down
3 changes: 1 addition & 2 deletions src/test/bench/msgsend-ring-mutex-arcs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]>;
Expand Down
3 changes: 1 addition & 2 deletions src/test/bench/msgsend-ring-pipes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@

// xfail-pretty

use future::future;

extern mod std;
use std::time;
use std::future;

use pipes::recv;

Expand Down
3 changes: 1 addition & 2 deletions src/test/bench/msgsend-ring-rw-arcs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]>;
Expand Down
2 changes: 1 addition & 1 deletion src/test/bench/msgsend-ring.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit d29962f

Please sign in to comment.