diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs index 2c2ccdcb714..05e405f6a5b 100644 --- a/components/compositing/lib.rs +++ b/components/compositing/lib.rs @@ -25,7 +25,6 @@ extern crate "util" as servo_util; extern crate gleam; extern crate libc; -extern crate native; extern crate time; extern crate url; diff --git a/components/compositing/scrolling.rs b/components/compositing/scrolling.rs index d36674b69e9..8649ac1d9a4 100644 --- a/components/compositing/scrolling.rs +++ b/components/compositing/scrolling.rs @@ -6,7 +6,6 @@ use compositor_task::{CompositorProxy, Msg}; -use native::task::NativeTaskBuilder; use std::io::timer; use std::task::TaskBuilder; use std::time::duration::Duration; @@ -34,7 +33,7 @@ enum ToScrollingTimerMsg { impl ScrollingTimerProxy { pub fn new(compositor_proxy: Box) -> ScrollingTimerProxy { let (to_scrolling_timer_sender, to_scrolling_timer_receiver) = channel(); - TaskBuilder::new().native().spawn(proc() { + TaskBuilder::new().spawn(proc() { let mut scrolling_timer = ScrollingTimer { compositor_proxy: compositor_proxy, receiver: to_scrolling_timer_receiver, diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs index 4d54758288d..e7ad3c65a4c 100644 --- a/components/gfx/lib.rs +++ b/components/gfx/lib.rs @@ -16,7 +16,6 @@ extern crate collections; extern crate geom; extern crate layers; extern crate libc; -extern crate native; extern crate rustrt; extern crate stb_image; extern crate png; diff --git a/components/gfx/paint_task.rs b/components/gfx/paint_task.rs index bc6c76e958b..1210c34627b 100644 --- a/components/gfx/paint_task.rs +++ b/components/gfx/paint_task.rs @@ -20,7 +20,6 @@ use layers::platform::surface::{NativeGraphicsMetadata, NativePaintingGraphicsCo use layers::platform::surface::{NativeSurface, NativeSurfaceMethods}; use layers::layers::{BufferRequest, LayerBuffer, LayerBufferSet}; use layers; -use native::task::NativeTaskBuilder; use servo_msg::compositor_msg::{Epoch, PaintState, LayerId}; use servo_msg::compositor_msg::{LayerMetadata, PaintListener, ScrollPolicy}; use servo_msg::constellation_msg::Msg as ConstellationMsg; @@ -442,7 +441,7 @@ impl WorkerThreadProxy { let native_graphics_metadata = native_graphics_metadata.clone(); let font_cache_task = font_cache_task.clone(); let time_profiler_chan = time_profiler_chan.clone(); - TaskBuilder::new().native().spawn(proc() { + TaskBuilder::new().spawn(proc() { let mut worker_thread = WorkerThread::new(from_worker_sender, to_worker_receiver, native_graphics_metadata, diff --git a/components/script/lib.rs b/components/script/lib.rs index 9c8bbccc701..490acb01c08 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -23,7 +23,6 @@ extern crate hyper; extern crate js; extern crate libc; extern crate msg; -extern crate native; extern crate net; extern crate rustrt; extern crate serialize; diff --git a/components/servo/lib.rs b/components/servo/lib.rs index bf64a9a4951..8d64a1d73bc 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -20,7 +20,6 @@ extern crate script; extern crate layout; extern crate gfx; extern crate libc; -extern crate native; extern crate rustrt; extern crate url; diff --git a/components/servo/main.rs b/components/servo/main.rs index 905ff205c61..be8dc7e7f03 100644 --- a/components/servo/main.rs +++ b/components/servo/main.rs @@ -11,7 +11,6 @@ extern crate libc; extern crate servo; -extern crate native; extern crate time; extern crate "util" as servo_util; diff --git a/components/util/lib.rs b/components/util/lib.rs index 6dbac1094d6..a1d31be4298 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -18,7 +18,6 @@ extern crate geom; extern crate getopts; extern crate layers; extern crate libc; -extern crate native; extern crate rand; extern crate rustrt; extern crate serialize; 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>(name: S, f: proc():Send) { } pub fn spawn_named_native>(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(name: &'static str, f: proc(): Send, msg: T, dest: Sender, - 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); diff --git a/ports/gonk/src/lib.rs b/ports/gonk/src/lib.rs index 17243bf37e2..468ae25938c 100644 --- a/ports/gonk/src/lib.rs +++ b/ports/gonk/src/lib.rs @@ -20,7 +20,6 @@ extern crate script; extern crate layout; extern crate gfx; extern crate libc; -extern crate native; extern crate rustrt; extern crate url; diff --git a/ports/gonk/src/main.rs b/ports/gonk/src/main.rs index ce233f901da..55aa1a6936e 100644 --- a/ports/gonk/src/main.rs +++ b/ports/gonk/src/main.rs @@ -6,7 +6,6 @@ #![deny(unused_variables)] extern crate servo; -extern crate native; extern crate time; extern crate "util" as servo_util;