12 files changed, 18 insertions, 19 deletions
diff --git a/components/script/dom/bindings/global.rs b/components/script/dom/bindings/global.rs
index f706d175a39..dc42d0da6e0 100644
--- a/components/script/dom/bindings/global.rs
+++ b/components/script/dom/bindings/global.rs
@@ -14,7 +14,7 @@ use dom::workerglobalscope::{WorkerGlobalScope, WorkerGlobalScopeHelpers};
 use dom::window;
 use script_task::ScriptChan;
 
-use servo_net::resource_task::ResourceTask;
+use net::resource_task::ResourceTask;
 
 use js::{JSCLASS_IS_GLOBAL, JSCLASS_IS_DOMJSCLASS};
 use js::glue::{GetGlobalForObjectCrossCompartment};
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs
index d906e570ece..d7b68f933b6 100644
--- a/components/script/dom/dedicatedworkerglobalscope.rs
+++ b/components/script/dom/dedicatedworkerglobalscope.rs
@@ -25,7 +25,7 @@ use script_task::{ScriptTask, ScriptChan, ScriptMsg, TimerSource};
 use script_task::ScriptMsg::WorkerDispatchErrorEvent;
 use script_task::StackRootTLS;
 
-use servo_net::resource_task::{ResourceTask, load_whole_resource};
+use net::resource_task::{ResourceTask, load_whole_resource};
 use util::task::spawn_named;
 use util::task_state;
 use util::task_state::{SCRIPT, IN_WORKER};
diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs
index 913f69c0553..2f8d09bb759 100644
--- a/components/script/dom/htmlimageelement.rs
+++ b/components/script/dom/htmlimageelement.rs
@@ -17,7 +17,7 @@ use dom::element::ElementTypeId;
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId, NodeHelpers, NodeDamage, window_from_node};
 use dom::virtualmethods::VirtualMethods;
-use servo_net::image_cache_task;
+use net::image_cache_task;
 use util::geometry::to_px;
 use util::str::DOMString;
 use string_cache::Atom;
diff --git a/components/script/dom/htmlobjectelement.rs b/components/script/dom/htmlobjectelement.rs
index 2a8c0c19818..927abe7e3c2 100644
--- a/components/script/dom/htmlobjectelement.rs
+++ b/components/script/dom/htmlobjectelement.rs
@@ -20,8 +20,8 @@ use dom::node::{Node, NodeTypeId, NodeHelpers, window_from_node};
 use dom::validitystate::ValidityState;
 use dom::virtualmethods::VirtualMethods;
 
-use servo_net::image_cache_task;
-use servo_net::image_cache_task::ImageCacheTask;
+use net::image_cache_task;
+use net::image_cache_task::ImageCacheTask;
 use util::str::DOMString;
 use string_cache::Atom;
 
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index 62a84450f9c..5ecdaa27903 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -29,7 +29,7 @@ use script_task::{ScriptMsg, Runnable};
 
 use encoding::all::UTF_8;
 use encoding::types::{Encoding, DecoderTrap};
-use servo_net::resource_task::load_whole_resource;
+use net::resource_task::load_whole_resource;
 use util::str::{DOMString, HTML_SPACE_CHARACTERS, StaticStringVec};
 use std::borrow::ToOwned;
 use std::cell::Cell;
diff --git a/components/script/dom/storage.rs b/components/script/dom/storage.rs
index 7834781988d..2dedef9f132 100644
--- a/components/script/dom/storage.rs
+++ b/components/script/dom/storage.rs
@@ -9,8 +9,8 @@ use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::utils::{Reflector, reflect_dom_object};
 use dom::bindings::error::Fallible;
 use util::str::DOMString;
-use servo_net::storage_task::StorageTask;
-use servo_net::storage_task::StorageTaskMsg;
+use net::storage_task::StorageTask;
+use net::storage_task::StorageTaskMsg;
 use std::sync::mpsc::channel;
 use url::Url;
 
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 98947376cc2..c69a781d95b 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -35,8 +35,8 @@ use timers::{IsInterval, TimerId, TimerManager, TimerCallback};
 
 use msg::compositor_msg::ScriptListener;
 use msg::constellation_msg::LoadData;
-use servo_net::image_cache_task::ImageCacheTask;
-use servo_net::storage_task::StorageTask;
+use net::image_cache_task::ImageCacheTask;
+use net::storage_task::StorageTask;
 use util::str::{DOMString,HTML_SPACE_CHARACTERS};
 
 use js::jsapi::JS_EvaluateUCScript;
diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs
index 24dd5c2b0f5..5b2ff2c971e 100644
--- a/components/script/dom/workerglobalscope.rs
+++ b/components/script/dom/workerglobalscope.rs
@@ -19,7 +19,7 @@ use dom::window::{base64_atob, base64_btoa};
 use script_task::{ScriptChan, TimerSource};
 use timers::{IsInterval, TimerId, TimerManager, TimerCallback};
 
-use servo_net::resource_task::{ResourceTask, load_whole_resource};
+use net::resource_task::{ResourceTask, load_whole_resource};
 use util::str::DOMString;
 
 use js::jsapi::JSContext;
diff --git a/components/script/lib.rs b/components/script/lib.rs
index b246b5ecda3..b22d47ab64a 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -32,7 +32,6 @@ extern crate canvas;
 extern crate script_traits;
 #[no_link] #[plugin] #[macro_use]
 extern crate "plugins" as servo_plugins;
-extern crate "net" as servo_net;
 extern crate util;
 #[macro_use]
 extern crate style;
diff --git a/components/script/page.rs b/components/script/page.rs
index 44103aae650..55729fd3591 100644
--- a/components/script/page.rs
+++ b/components/script/page.rs
@@ -25,8 +25,8 @@ use js::rust::Cx;
 use msg::compositor_msg::ScriptListener;
 use msg::constellation_msg::{ConstellationChan, WindowSizeData};
 use msg::constellation_msg::{PipelineId, SubpageId};
-use servo_net::resource_task::ResourceTask;
-use servo_net::storage_task::StorageTask;
+use net::resource_task::ResourceTask;
+use net::storage_task::StorageTask;
 use util::geometry::{Au, MAX_RECT};
 use util::geometry;
 use util::str::DOMString;
diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs
index d846f0bc792..387d031ff6c 100644
--- a/components/script/parse/html.rs
+++ b/components/script/parse/html.rs
@@ -23,7 +23,7 @@ use parse::Parser;
 use encoding::all::UTF_8;
 use encoding::types::{Encoding, DecoderTrap};
 
-use servo_net::resource_task::{ProgressMsg, LoadResponse};
+use net::resource_task::{ProgressMsg, LoadResponse};
 use util::task_state;
 use util::task_state::IN_HTML_PARSER;
 use std::ascii::AsciiExt;
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 438fe67502d..4b64700b8bc 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -59,10 +59,10 @@ use msg::constellation_msg::{Failure, Msg, WindowSizeData, Key, KeyState};
 use msg::constellation_msg::{KeyModifiers, SUPER, SHIFT, CONTROL, ALT};
 use msg::constellation_msg::{PipelineExitType};
 use msg::constellation_msg::Msg as ConstellationMsg;
-use servo_net::image_cache_task::ImageCacheTask;
-use servo_net::resource_task::{ResourceTask, ControlMsg};
-use servo_net::resource_task::LoadData as NetLoadData;
-use servo_net::storage_task::StorageTask;
+use net::image_cache_task::ImageCacheTask;
+use net::resource_task::{ResourceTask, ControlMsg};
+use net::resource_task::LoadData as NetLoadData;
+use net::storage_task::StorageTask;
 use util::geometry::to_frac_px;
 use util::smallvec::SmallVec;
 use util::str::DOMString;