diff options
author | Ms2ger <ms2ger@gmail.com> | 2015-01-04 11:58:37 +0100 |
---|---|---|
committer | Ms2ger <ms2ger@gmail.com> | 2015-01-04 16:28:02 +0100 |
commit | 04eb923da9af9988780a5dcc610b56e219866a9d (patch) | |
tree | e46eeba3ea9efe1d6f4bae9a2bfe52d25eccef49 /components/util/task.rs | |
parent | 394508953ec61ede4c516a9bef912b320d66c084 (diff) | |
download | servo-04eb923da9af9988780a5dcc610b56e219866a9d.tar.gz servo-04eb923da9af9988780a5dcc610b56e219866a9d.zip |
Remove dependencies on the native crate.
Diffstat (limited to 'components/util/task.rs')
-rw-r--r-- | components/util/task.rs | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/components/util/task.rs b/components/util/task.rs index 6047fdb3dae..5907841e434 100644 --- a/components/util/task.rs +++ b/components/util/task.rs @@ -6,7 +6,6 @@ use std::str::IntoMaybeOwned; use std::task; use std::comm::Sender; use std::task::TaskBuilder; -use native::task::NativeTaskBuilder; use rtinstrument; use task_state; @@ -18,10 +17,7 @@ pub fn spawn_named<S: IntoMaybeOwned<'static>>(name: S, f: proc():Send) { } pub fn spawn_named_native<S: IntoMaybeOwned<'static>>(name: S, f: proc():Send) { - let builder = task::TaskBuilder::new().named(name).native(); - builder.spawn(proc() { - rtinstrument::instrument(f); - }); + spawn_named(name, f) } /// Arrange to send a particular message to a channel if the task fails. @@ -30,17 +26,11 @@ pub fn spawn_named_with_send_on_failure<T: Send>(name: &'static str, f: proc(): Send, msg: T, dest: Sender<T>, - native: bool) { - let with_state = proc() { + _native: bool) { + let future_result = TaskBuilder::new().named(name).try_future(proc() { task_state::initialize(state); rtinstrument::instrument(f); - }; - - let future_result = if native { - TaskBuilder::new().named(name).native().try_future(with_state) - } else { - TaskBuilder::new().named(name).try_future(with_state) - }; + }); let watched_name = name.into_string(); let watcher_name = format!("{}Watcher", watched_name); |