auto merge of #4542 : servo/servo/pre-rustup_20141221, r=saneyuki

In particular, this contains changes to qualify enums where rust will require it, and to stop using some features that will be removed.

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);