aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/main/pipeline.rs
diff options
context:
space:
mode:
authorKeegan McAllister <kmcallister@mozilla.com>2013-10-29 14:55:17 -0700
committerJack Moffitt <jack@metajack.im>2013-10-31 14:58:55 -0600
commitb451ff3e15bdc5fafa7e531b5904118ded07a9d5 (patch)
tree74f3dae1997592231851fbb11789a88dfebd99e1 /src/components/main/pipeline.rs
parent4d23ce41af912268ede819dc93844bd2bce84adc (diff)
downloadservo-b451ff3e15bdc5fafa7e531b5904118ded07a9d5.tar.gz
servo-b451ff3e15bdc5fafa7e531b5904118ded07a9d5.zip
Other language changes
Diffstat (limited to 'src/components/main/pipeline.rs')
-rw-r--r--src/components/main/pipeline.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/components/main/pipeline.rs b/src/components/main/pipeline.rs
index 9c89a07fb4e..7b619de378a 100644
--- a/src/components/main/pipeline.rs
+++ b/src/components/main/pipeline.rs
@@ -101,9 +101,8 @@ impl Pipeline {
// Wrap task creation within a supervised task so that failure will
// only tear down those tasks instead of ours.
let failure_chan = constellation_chan.clone();
- let (task_port, task_chan) = stream::<task::TaskResult>();
let mut supervised_task = task::task();
- supervised_task.opts.notify_chan = Some(task_chan);
+ let task_port = supervised_task.future_result();
supervised_task.supervised();
spawn_with!(supervised_task, [script_port, resource_task, size, render_port,
@@ -138,8 +137,8 @@ impl Pipeline {
spawn_with!(task::task(), [failure_chan], {
match task_port.recv() {
- task::Success => (),
- task::Failure => {
+ Ok(*) => (),
+ Err(*) => {
failure_chan.send(FailureMsg(id, subpage_id));
}
}