Skip to content

Commit 0d4d850

Browse files
committed
---
yaml --- r: 22670 b: refs/heads/master c: c7a6a66 h: refs/heads/master v: v3
1 parent ff983e5 commit 0d4d850

File tree

2 files changed

+1
-47
lines changed

2 files changed

+1
-47
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: e6efb24f3fa47462a3febd052e5ccc21e2c3ec63
2+
refs/heads/master: c7a6a66e4b8c26d25f3eb28010e71ba61aa086b5
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/task.rs

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ export add_wrapper;
4545
export run;
4646

4747
export future_result;
48-
export future_task;
4948
export unsupervise;
5049
export run_listener;
5150
export run_with;
@@ -464,30 +463,6 @@ fn future_result(builder: builder) -> future::future<task_result> {
464463
}
465464
}
466465

467-
fn future_task(builder: builder) -> future::future<task> {
468-
//! Get a future representing the handle to the new task
469-
470-
import future::future_pipe;
471-
472-
let (po, ch) = future_pipe::init();
473-
474-
let ch = ~mut some(ch);
475-
476-
do add_wrapper(builder) |body, move ch| {
477-
let ch = { let mut t = none;
478-
t <-> *ch;
479-
~mut t};
480-
fn~(move ch) {
481-
let mut po = none;
482-
po <-> *ch;
483-
future_pipe::server::completed(option::unwrap(po),
484-
get_task());
485-
body();
486-
}
487-
}
488-
future::from_port(po)
489-
}
490-
491466
fn unsupervise(builder: builder) {
492467
//! Configures the new task to not propagate failure to its parent
493468
@@ -1476,16 +1451,6 @@ fn test_future_result() {
14761451
assert future::get(option::unwrap(result)) == failure;
14771452
}
14781453

1479-
#[test]
1480-
fn test_future_task() {
1481-
let po = comm::port();
1482-
let ch = comm::chan(po);
1483-
let buildr = builder();
1484-
let task1 = future_task(buildr);
1485-
do run(buildr) { comm::send(ch, get_task()) }
1486-
assert future::get(task1) == comm::recv(po);
1487-
}
1488-
14891454
#[test]
14901455
fn test_spawn_listiner_bidi() {
14911456
let po = comm::port();
@@ -1700,17 +1665,6 @@ fn test_avoid_copying_the_body_try() {
17001665
}
17011666
}
17021667
1703-
#[test]
1704-
fn test_avoid_copying_the_body_future_task() {
1705-
do avoid_copying_the_body |f| {
1706-
let buildr = builder();
1707-
future_task(buildr);
1708-
do run(buildr) {
1709-
f();
1710-
}
1711-
}
1712-
}
1713-
17141668
#[test]
17151669
fn test_avoid_copying_the_body_unlinked() {
17161670
do avoid_copying_the_body |f| {

0 commit comments

Comments
 (0)