aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/task_source/mod.rs
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2017-09-20 10:37:09 +0200
committerAnthony Ramine <n.oxyde@gmail.com>2017-09-20 10:37:09 +0200
commit6c9fb5ae7a4eb6cff38de3bb6446af304a32bc8a (patch)
tree63a8bd729171e5886340fe89774f2287bd11cb5b /components/script/task_source/mod.rs
parent52527d6f9dfaae13458059243d975f5336bdead4 (diff)
downloadservo-6c9fb5ae7a4eb6cff38de3bb6446af304a32bc8a.tar.gz
servo-6c9fb5ae7a4eb6cff38de3bb6446af304a32bc8a.zip
Introduce TaskOnce
Having both TaskBox and TaskOnce allows us to remove the superfluous inner boxing from CancellableTask<T>.
Diffstat (limited to 'components/script/task_source/mod.rs')
-rw-r--r--components/script/task_source/mod.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/components/script/task_source/mod.rs b/components/script/task_source/mod.rs
index e361ccf2d99..4818ba2c80c 100644
--- a/components/script/task_source/mod.rs
+++ b/components/script/task_source/mod.rs
@@ -11,21 +11,21 @@ pub mod user_interaction;
use dom::globalscope::GlobalScope;
use std::result::Result;
-use task::{TaskBox, TaskCanceller};
+use task::{TaskCanceller, TaskOnce};
pub trait TaskSource {
fn queue_with_canceller<T>(
&self,
- msg: Box<T>,
+ task: T,
canceller: &TaskCanceller,
) -> Result<(), ()>
where
- T: TaskBox + 'static;
+ T: TaskOnce + 'static;
- fn queue<T>(&self, msg: Box<T>, global: &GlobalScope) -> Result<(), ()>
+ fn queue<T>(&self, task: T, global: &GlobalScope) -> Result<(), ()>
where
- T: TaskBox + 'static,
+ T: TaskOnce + 'static,
{
- self.queue_with_canceller(msg, &global.task_canceller())
+ self.queue_with_canceller(task, &global.task_canceller())
}
}