Split out shared networking code into net_traits crate

Fixes #4476

components/script/Cargo.toml

@@ -21,8 +21,8 @@ path = "../util"
 [dependencies.msg]
 path = "../msg"
 
-[dependencies.net]
-path = "../net"
+[dependencies.net_traits]
+path = "../net_traits"
 
 [dependencies.profile]
 path = "../profile"

components/script/dom/bindings/global.rs

@@ -15,8 +15,7 @@ use dom::window::{self, WindowHelpers};
 use script_task::ScriptChan;
 
 use msg::constellation_msg::WorkerId;
-
-use net::resource_task::ResourceTask;
+use net_traits::ResourceTask;
 
 use js::{JSCLASS_IS_GLOBAL, JSCLASS_IS_DOMJSCLASS};
 use js::glue::{GetGlobalForObjectCrossCompartment};

components/script/dom/bindings/trace.rs

@@ -48,8 +48,8 @@ use js::rust::{Cx, rt};
 use layout_interface::{LayoutRPC, LayoutChan};
 use libc;
 use msg::constellation_msg::{PipelineId, SubpageId, WindowSizeData, WorkerId};
-use net::image_cache_task::ImageCacheTask;
-use net::storage_task::StorageType;
+use net_traits::image_cache_task::ImageCacheTask;
+use net_traits::storage_task::StorageType;
 use script_traits::ScriptControlChan;
 use script_traits::UntrustedNodeAddress;
 use msg::compositor_msg::ScriptListener;

components/script/dom/dedicatedworkerglobalscope.rs

@@ -24,7 +24,7 @@ use dom::workerglobalscope::WorkerGlobalScopeTypeId;
 use script_task::{ScriptTask, ScriptChan, ScriptMsg, TimerSource};
 use script_task::StackRootTLS;
 
-use net::resource_task::{ResourceTask, load_whole_resource};
+use net_traits::{load_whole_resource, ResourceTask};
 use util::task::spawn_named;
 use util::task_state;
 use util::task_state::{SCRIPT, IN_WORKER};

components/script/dom/document.rs

@@ -63,8 +63,8 @@ use msg::compositor_msg::ScriptListener;
 use msg::constellation_msg::Msg as ConstellationMsg;
 use msg::constellation_msg::{ConstellationChan, Key, KeyState, KeyModifiers, MozBrowserEvent};
 use msg::constellation_msg::{SUPER, ALT, SHIFT, CONTROL};
-use net::resource_task::ControlMsg::{SetCookiesForUrl, GetCookiesForUrl};
-use net::cookie_storage::CookieSource::NonHTTP;
+use net_traits::CookieSource::NonHTTP;
+use net_traits::ControlMsg::{SetCookiesForUrl, GetCookiesForUrl};
 use script_task::Runnable;
 use script_traits::{MouseButton, UntrustedNodeAddress};
 use util::{opts, namespace};

components/script/dom/htmlimageelement.rs

@@ -18,7 +18,7 @@ use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
 use dom::node::{Node, NodeTypeId, NodeHelpers, NodeDamage, window_from_node};
 use dom::virtualmethods::VirtualMethods;
 use dom::window::WindowHelpers;
-use net::image_cache_task;
+use net_traits::image_cache_task;
 use util::geometry::to_px;
 use util::str::DOMString;
 use string_cache::Atom;

components/script/dom/htmlobjectelement.rs

@@ -20,8 +20,7 @@ use dom::node::{Node, NodeTypeId, NodeHelpers, window_from_node};
 use dom::validitystate::ValidityState;
 use dom::virtualmethods::VirtualMethods;
 
-use net::image_cache_task;
-use net::image_cache_task::ImageCacheTask;
+use net_traits::image_cache_task::{self, ImageCacheTask};
 use util::str::DOMString;
 use string_cache::Atom;
 

components/script/dom/htmlscriptelement.rs

@@ -33,7 +33,7 @@ use script_task::{ScriptMsg, Runnable};
 use encoding::all::UTF_8;
 use encoding::label::encoding_from_whatwg_label;
 use encoding::types::{Encoding, EncodingRef, DecoderTrap};
-use net::resource_task::{load_whole_resource, Metadata};
+use net_traits::{load_whole_resource, Metadata};
 use util::str::{DOMString, HTML_SPACE_CHARACTERS, StaticStringVec};
 use std::borrow::ToOwned;
 use std::cell::Cell;

components/script/dom/storage.rs

@@ -15,10 +15,8 @@ use dom::storageevent::StorageEvent;
 use dom::urlhelper::UrlHelper;
 use dom::window::WindowHelpers;
 use util::str::DOMString;
-use net::storage_task::StorageTask;
-use net::storage_task::StorageType;
-use net::storage_task::StorageTaskMsg;
 use page::IterablePage;
+use net_traits::storage_task::{StorageTask, StorageTaskMsg, StorageType};
 use std::sync::mpsc::channel;
 use url::Url;
 

components/script/dom/window.rs

@@ -37,9 +37,9 @@ use timers::{IsInterval, TimerId, TimerManager, TimerCallback};
 use devtools_traits::DevtoolsControlChan;
 use msg::compositor_msg::ScriptListener;
 use msg::constellation_msg::{LoadData, PipelineId, SubpageId, ConstellationChan, WindowSizeData, WorkerId};
-use net::image_cache_task::ImageCacheTask;
-use net::resource_task::ResourceTask;
-use net::storage_task::{StorageTask, StorageType};
+use net_traits::ResourceTask;
+use net_traits::image_cache_task::ImageCacheTask;
+use net_traits::storage_task::{StorageTask, StorageType};
 use util::geometry::{self, Au, MAX_RECT};
 use util::opts;
 use util::str::{DOMString,HTML_SPACE_CHARACTERS};

components/script/dom/workerglobalscope.rs

@@ -20,8 +20,7 @@ use script_task::{ScriptChan, TimerSource};
 use timers::{IsInterval, TimerId, TimerManager, TimerCallback};
 
 use msg::constellation_msg::WorkerId;
-
-use net::resource_task::{ResourceTask, load_whole_resource};
+use net_traits::{load_whole_resource, ResourceTask};
 use util::str::DOMString;
 
 use js::jsapi::JSContext;

components/script/dom/xmlhttprequest.rs

@@ -42,9 +42,9 @@ use js::jsapi::{JS_ParseJSON, JSContext};
 use js::jsapi::JS_ClearPendingException;
 use js::jsval::{JSVal, NullValue, UndefinedValue};
 
-use net::resource_task::{ResourceTask, ResourceCORSData, LoadData, LoadResponse};
-use net::resource_task::ControlMsg::Load;
-use net::resource_task::ProgressMsg::{Payload, Done};
+use net_traits::ControlMsg::Load;
+use net_traits::ProgressMsg::{Payload, Done};
+use net_traits::{ResourceTask, ResourceCORSData, LoadData, LoadResponse};
 use cors::{allow_cross_origin_request, CORSRequest, RequestMode};
 use util::str::DOMString;
 use util::task::spawn_named;

components/script/lib.rs

@@ -39,7 +39,7 @@ extern crate hyper;
 extern crate js;
 extern crate libc;
 extern crate msg;
-extern crate net;
+extern crate net_traits;
 extern crate "rustc-serialize" as rustc_serialize;
 extern crate time;
 extern crate canvas;

components/script/parse/html.rs

@@ -26,7 +26,7 @@ use parse::Parser;
 use encoding::all::UTF_8;
 use encoding::types::{Encoding, DecoderTrap};
 
-use net::resource_task::{ProgressMsg, LoadResponse};
+use net_traits::{ProgressMsg, LoadResponse};
 use util::task_state;
 use util::task_state::IN_HTML_PARSER;
 use std::ascii::AsciiExt;

components/script/script_task.rs

@@ -60,10 +60,10 @@ use msg::constellation_msg::{ConstellationChan};
 use msg::constellation_msg::{LoadData, PipelineId, SubpageId, MozBrowserEvent, WorkerId};
 use msg::constellation_msg::{Failure, WindowSizeData, PipelineExitType};
 use msg::constellation_msg::Msg as ConstellationMsg;
-use net::image_cache_task::ImageCacheTask;
-use net::resource_task::{ResourceTask, ControlMsg, LoadResponse};
-use net::resource_task::LoadData as NetLoadData;
-use net::storage_task::StorageTask;
+use net_traits::{ResourceTask, ControlMsg, LoadResponse};
+use net_traits::LoadData as NetLoadData;
+use net_traits::image_cache_task::ImageCacheTask;
+use net_traits::storage_task::StorageTask;
 use string_cache::Atom;
 use util::geometry::to_frac_px;
 use util::smallvec::SmallVec;