auto merge of #5465 : gilles-leblanc/servo/issue-4476-b, r=jdm

Fixes #4476

components/compositing/Cargo.toml

@@ -25,6 +25,9 @@ path = "../net"
 [dependencies.profile]
 path = "../profile"
 
+[dependencies.net_traits]
+path = "../net_traits"
+
 [dependencies.util]
 path = "../util"
 

components/compositing/constellation.rs

@@ -20,9 +20,10 @@ use msg::constellation_msg::{IFrameSandboxState, MozBrowserEvent, NavigationDire
 use msg::constellation_msg::{Key, KeyState, KeyModifiers, LoadData};
 use msg::constellation_msg::{SubpageId, WindowSizeData};
 use msg::constellation_msg::{self, ConstellationChan, Failure};
-use net::image_cache_task::{ImageCacheTask, ImageCacheTaskClient};
-use net::resource_task::{self, ResourceTask};
-use net::storage_task::{StorageTask, StorageTaskMsg};
+use net::image_cache_task::ImageCacheTaskClient;
+use net_traits::{self, ResourceTask};
+use net_traits::image_cache_task::ImageCacheTask;
+use net_traits::storage_task::{StorageTask, StorageTaskMsg};
 use profile::mem;
 use profile::time;
 use script_traits::{CompositorEvent, ConstellationControlMsg};
@@ -392,7 +393,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
             pipeline.exit(PipelineExitType::Complete);
         }
         self.image_cache_task.exit();
-        self.resource_task.send(resource_task::ControlMsg::Exit).unwrap();
+        self.resource_task.send(net_traits::ControlMsg::Exit).unwrap();
         self.devtools_chan.as_ref().map(|chan| {
             chan.send(DevtoolsControlMsg::ServerExitMsg).unwrap();
         });

components/compositing/lib.rs

@@ -23,6 +23,7 @@ extern crate script_traits;
 extern crate msg;
 extern crate net;
 extern crate profile;
+extern crate net_traits;
 #[macro_use]
 extern crate util;
 extern crate gleam;

components/compositing/pipeline.rs

@@ -16,11 +16,11 @@ use gfx::font_cache_task::FontCacheTask;
 use layers::geometry::DevicePixel;
 use msg::constellation_msg::{ConstellationChan, Failure, FrameId, PipelineId, SubpageId};
 use msg::constellation_msg::{LoadData, WindowSizeData, PipelineExitType, MozBrowserEvent};
-use net::image_cache_task::ImageCacheTask;
-use net::resource_task::ResourceTask;
-use net::storage_task::StorageTask;
 use profile::mem;
 use profile::time;
+use net_traits::ResourceTask;
+use net_traits::image_cache_task::ImageCacheTask;
+use net_traits::storage_task::StorageTask;
 use std::sync::mpsc::{Receiver, channel};
 use url::Url;
 use util::geometry::{PagePx, ViewportPx};

components/gfx/Cargo.toml

@@ -11,8 +11,8 @@ path = "lib.rs"
 [dependencies.plugins]
 path = "../plugins"
 
-[dependencies.net]
-path = "../net"
+[dependencies.net_traits]
+path = "../net_traits"
 
 [dependencies.util]
 path = "../util"

components/gfx/display_list/mod.rs

@@ -33,7 +33,7 @@ use geom::num::Zero;
 use libc::uintptr_t;
 use paint_task::PaintLayer;
 use msg::compositor_msg::LayerId;
-use net::image::base::Image;
+use net_traits::image::base::Image;
 use util::cursor::Cursor;
 use util::linked_list::prepend_from;
 use util::geometry::{self, Au, MAX_RECT, ZERO_RECT};

components/gfx/font_cache_task.rs

@@ -10,7 +10,7 @@ use platform::font_context::FontContextHandle;
 
 use collections::str::Str;
 use font_template::{FontTemplate, FontTemplateDescriptor};
-use net::resource_task::{ResourceTask, load_whole_resource};
+use net_traits::{ResourceTask, load_whole_resource};
 use platform::font_template::FontTemplateData;
 use std::borrow::ToOwned;
 use std::collections::HashMap;

components/gfx/lib.rs

@@ -31,7 +31,7 @@ extern crate profile;
 extern crate script_traits;
 extern crate "rustc-serialize" as rustc_serialize;
 extern crate unicode;
-extern crate net;
+extern crate net_traits;
 #[macro_use]
 extern crate util;
 extern crate msg;

components/gfx/paint_context.rs

@@ -29,7 +29,7 @@ use geom::rect::Rect;
 use geom::side_offsets::SideOffsets2D;
 use geom::size::Size2D;
 use libc::types::common::c99::{uint16_t, uint32_t};
-use net::image::base::Image;
+use net_traits::image::base::Image;
 use png::PixelsByColorType;
 use std::default::Default;
 use std::f32;

components/layout/Cargo.toml

@@ -34,8 +34,8 @@ path = "../style"
 [dependencies.plugins]
 path = "../plugins"
 
-[dependencies.net]
-path = "../net"
+[dependencies.net_traits]
+path = "../net_traits"
 
 [dependencies.profile]
 path = "../profile"

components/layout/context.rs

@@ -13,9 +13,9 @@ use gfx::display_list::OpaqueNode;
 use gfx::font_cache_task::FontCacheTask;
 use gfx::font_context::FontContext;
 use msg::constellation_msg::ConstellationChan;
-use net::local_image_cache::LocalImageCache;
 use script::layout_interface::{Animation, LayoutChan};
 use script_traits::UntrustedNodeAddress;
+use net_traits::local_image_cache::LocalImageCache;
 use std::boxed;
 use std::cell::Cell;
 use std::ptr;

components/layout/display_list_builder.rs

@@ -36,7 +36,7 @@ use png::{self, PixelsByColorType};
 use msg::compositor_msg::ScrollPolicy;
 use msg::constellation_msg::Msg as ConstellationMsg;
 use msg::constellation_msg::ConstellationChan;
-use net::image::holder::ImageHolder;
+use net_traits::image::holder::ImageHolder;
 use util::cursor::Cursor;
 use util::geometry::{self, Au, ZERO_POINT, to_px, to_frac_px};
 use util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize, WritingMode};

components/layout/fragment.rs

@@ -30,8 +30,8 @@ use gfx::text::text_run::{TextRun, TextRunSlice};
 use script_traits::UntrustedNodeAddress;
 use rustc_serialize::{Encodable, Encoder};
 use msg::constellation_msg::{ConstellationChan, Msg, PipelineId, SubpageId};
-use net::image::holder::ImageHolder;
-use net::local_image_cache::LocalImageCache;
+use net_traits::image::holder::ImageHolder;
+use net_traits::local_image_cache::LocalImageCache;
 use util::geometry::{self, Au, ZERO_POINT};
 use util::logical_geometry::{LogicalRect, LogicalSize, LogicalMargin, WritingMode};
 use util::range::*;

components/layout/layout_task.rs

@@ -41,12 +41,12 @@ use log;
 use msg::compositor_msg::ScrollPolicy;
 use msg::constellation_msg::Msg as ConstellationMsg;
 use msg::constellation_msg::{ConstellationChan, Failure, PipelineExitType, PipelineId};
-use net::image_cache_task::{ImageCacheTask, ImageResponseMsg};
-use net::local_image_cache::{ImageResponder, LocalImageCache};
-use net::resource_task::{ResourceTask, load_bytes_iter};
 use profile::mem::{self, Report, ReportsChan};
 use profile::time::{self, ProfilerMetadata, profile};
 use profile::time::{TimerMetadataFrameType, TimerMetadataReflowType};
+use net_traits::{load_bytes_iter, ResourceTask};
+use net_traits::image_cache_task::{ImageCacheTask, ImageResponseMsg};
+use net_traits::local_image_cache::{ImageResponder, LocalImageCache};
 use script::dom::bindings::js::LayoutJS;
 use script::dom::node::{LayoutData, Node};
 use script::layout_interface::{Animation, ContentBoxResponse, ContentBoxesResponse};

components/layout/lib.rs

@@ -30,7 +30,7 @@ extern crate bitflags;
 #[macro_use]
 #[no_link]
 extern crate "plugins" as servo_plugins;
-
+extern crate net_traits;
 #[macro_use]
 extern crate profile;
 
@@ -50,7 +50,6 @@ extern crate gfx;
 extern crate layout_traits;
 extern crate libc;
 extern crate msg;
-extern crate net;
 extern crate png;
 extern crate script;
 extern crate script_traits;

components/layout_traits/Cargo.toml

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

components/layout_traits/lib.rs

@@ -5,8 +5,8 @@
 extern crate gfx;
 extern crate script_traits;
 extern crate msg;
-extern crate net;
 extern crate profile;
+extern crate net_traits;
 extern crate url;
 extern crate util;
 
@@ -18,13 +18,13 @@ extern crate util;
 use gfx::font_cache_task::FontCacheTask;
 use gfx::paint_task::PaintChan;
 use msg::constellation_msg::{ConstellationChan, Failure, PipelineId, PipelineExitType};
-use net::image_cache_task::ImageCacheTask;
-use net::resource_task::ResourceTask;
 use profile::mem;
 use profile::time;
+use net_traits::ResourceTask;
+use net_traits::image_cache_task::ImageCacheTask;
+use url::Url;
 use script_traits::{ScriptControlChan, OpaqueScriptLayoutChannel};
 use std::sync::mpsc::{Sender, Receiver};
-use url::Url;
 
 /// Messages sent to the layout task from the constellation
 pub enum LayoutControlMsg {

components/net/Cargo.toml

@@ -10,6 +10,9 @@ path = "lib.rs"
 [dependencies.profile]
 path = "../profile"
 
+[dependencies.net_traits]
+path = "../net_traits"
+
 [dependencies.util]
 path = "../util"
 
@@ -19,9 +22,6 @@ git = "https://github.com/servo/rust-geom"
 [dependencies.png]
 git = "https://github.com/servo/rust-png"
 
-[dependencies.stb_image]
-git = "https://github.com/servo/rust-stb-image"
-
 [dependencies]
 url = "0.2.16"
 time = "0.1.17"

components/net/about_loader.rs

@@ -2,8 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use resource_task::{TargetedLoadResponse, Metadata, LoadData, start_sending, ResponseSenders};
-use resource_task::ProgressMsg::Done;
+use net_traits::{LoadData, Metadata};
+use net_traits::ProgressMsg::Done;
+use resource_task::{TargetedLoadResponse, start_sending, ResponseSenders};
 use file_loader;
 
 use url::Url;

components/net/cookie.rs

@@ -5,7 +5,7 @@
 //! Implementation of cookie creation and matching as specified by
 //! http://tools.ietf.org/html/rfc6265
 
-use cookie_storage::CookieSource;
+use net_traits::CookieSource;
 use pub_domains::PUB_DOMAINS;
 
 use cookie_rs;
@@ -196,7 +196,7 @@ fn test_default_path() {
 
 #[test]
 fn fn_cookie_constructor() {
-    use cookie_storage::CookieSource;
+    use net_traits::CookieSource;
 
     let url = &Url::parse("http://example.com/foo").unwrap();
 

components/net/cookie_storage.rs

@@ -5,19 +5,11 @@
 //! Implementation of cookie storage as specified in
 //! http://tools.ietf.org/html/rfc6265
 
+use net_traits::CookieSource;
 use url::Url;
 use cookie::Cookie;
 use std::cmp::Ordering;
 
-/// The creator of a given cookie
-#[derive(PartialEq, Copy)]
-pub enum CookieSource {
-    /// An HTTP API
-    HTTP,
-    /// A non-HTTP API
-    NonHTTP,
-}
-
 pub struct CookieStorage {
     cookies: Vec<Cookie>
 }

components/net/data_loader.rs

@@ -2,8 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use resource_task::{Metadata, LoadData, TargetedLoadResponse, start_sending, ResponseSenders};
-use resource_task::ProgressMsg::{Payload, Done};
+use net_traits::{LoadData, Metadata};
+use net_traits::ProgressMsg::{Payload, Done};
+use resource_task::{TargetedLoadResponse, start_sending, ResponseSenders};
 
 use rustc_serialize::base64::FromBase64;
 

components/net/file_loader.rs

@@ -2,8 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use resource_task::{ProgressMsg, Metadata, LoadData, start_sending, TargetedLoadResponse, ResponseSenders};
-use resource_task::ProgressMsg::{Payload, Done};
+use net_traits::{LoadData, Metadata, ProgressMsg};
+use net_traits::ProgressMsg::{Payload, Done};
+use resource_task::{start_sending, TargetedLoadResponse, ResponseSenders};
 
 use std::borrow::ToOwned;
 use std::io;

components/net/http_loader.rs

@@ -2,10 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use cookie_storage::CookieSource;
-use resource_task::{Metadata, TargetedLoadResponse, LoadData, start_sending_opt, ResponseSenders, ProgressMsg};
-use resource_task::ControlMsg;
-use resource_task::ProgressMsg::{Payload, Done};
+use net_traits::{ControlMsg, CookieSource, LoadData, Metadata};
+use net_traits::ProgressMsg;
+use net_traits::ProgressMsg::{Payload, Done};
+use resource_task::{TargetedLoadResponse, start_sending_opt, ResponseSenders};
 
 use log;
 use std::collections::HashSet;
@@ -38,7 +38,7 @@ pub fn factory(cookies_chan: Sender<ControlMsg>)
 }
 
 fn send_error(url: Url, err: String, senders: ResponseSenders) {
-    let mut metadata = Metadata::default(url);
+    let mut metadata: Metadata = Metadata::default(url);
     metadata.status = None;
 
     match start_sending_opt(senders, metadata) {
@@ -283,7 +283,7 @@ reason: \"certificate verify failed\" }]";
         if viewing_source {
             adjusted_headers.set(ContentType(Mime(TopLevel::Text, SubLevel::Plain, vec![])));
         }
-        let mut metadata = Metadata::default(url);
+        let mut metadata: Metadata = Metadata::default(url);
         metadata.set_content_type(match adjusted_headers.get() {
             Some(&ContentType(ref mime)) => Some(mime),
             None => None