servo: Merge #4887 - Import net as net rather than servo_net (from Ms2ger:servo_net); r=jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: e3a4d493117ffd09ce75270b36012845ebb9c08c

servo/components/compositing/constellation.rs

@@ -24,10 +24,10 @@ use msg::constellation_msg::{LoadData, NavigationType};
 use msg::constellation_msg::{PipelineExitType, PipelineId};
 use msg::constellation_msg::{SubpageId, WindowSizeData};
 use msg::constellation_msg::Msg as ConstellationMsg;
-use servo_net::image_cache_task::{ImageCacheTask, ImageCacheTaskClient};
-use servo_net::resource_task::ResourceTask;
-use servo_net::resource_task;
-use servo_net::storage_task::{StorageTask, StorageTaskMsg};
+use net::image_cache_task::{ImageCacheTask, ImageCacheTaskClient};
+use net::resource_task::ResourceTask;
+use net::resource_task;
+use net::storage_task::{StorageTask, StorageTaskMsg};
 use util::cursor::Cursor;
 use util::geometry::{PagePx, ViewportPx};
 use util::opts;

servo/components/compositing/lib.rs

@@ -20,7 +20,7 @@ extern crate layout_traits;
 extern crate png;
 extern crate script_traits;
 extern crate msg;
-extern crate "net" as servo_net;
+extern crate net;
 #[macro_use]
 extern crate util;
 extern crate gleam;

servo/components/compositing/pipeline.rs

@@ -13,9 +13,9 @@ use gfx::paint_task::{PaintChan, PaintTask};
 use gfx::font_cache_task::FontCacheTask;
 use msg::constellation_msg::{ConstellationChan, Failure, PipelineId, SubpageId};
 use msg::constellation_msg::{LoadData, WindowSizeData, PipelineExitType};
-use servo_net::image_cache_task::ImageCacheTask;
-use servo_net::resource_task::ResourceTask;
-use servo_net::storage_task::StorageTask;
+use net::image_cache_task::ImageCacheTask;
+use net::resource_task::ResourceTask;
+use net::storage_task::StorageTask;
 use util::time::TimeProfilerChan;
 use std::rc::Rc;
 use std::sync::mpsc::{Receiver, channel};

servo/components/gfx/display_list/mod.rs

@@ -31,7 +31,7 @@ use geom::num::Zero;
 use libc::uintptr_t;
 use paint_task::PaintLayer;
 use msg::compositor_msg::LayerId;
-use servo_net::image::base::Image;
+use net::image::base::Image;
 use util::cursor::Cursor;
 use util::dlist as servo_dlist;
 use util::geometry::{self, Au, MAX_RECT, ZERO_RECT};

servo/components/gfx/font_cache_task.rs

@@ -15,7 +15,7 @@ use std::sync::Arc;
 use std::sync::mpsc::{Sender, Receiver, channel};
 use font_template::{FontTemplate, FontTemplateDescriptor};
 use platform::font_template::FontTemplateData;
-use servo_net::resource_task::{ResourceTask, load_whole_resource};
+use net::resource_task::{ResourceTask, load_whole_resource};
 use util::task::spawn_named;
 use util::str::LowercaseString;
 use style::font_face::Source;

servo/components/gfx/lib.rs

@@ -22,7 +22,7 @@ extern crate "serialize" as rustc_serialize;
 extern crate unicode;
 #[no_link] #[plugin]
 extern crate "plugins" as servo_plugins;
-extern crate "net" as servo_net;
+extern crate net;
 #[macro_use]
 extern crate util;
 extern crate msg;

servo/components/gfx/paint_context.rs

@@ -26,7 +26,7 @@ use geom::size::Size2D;
 use libc::size_t;
 use libc::types::common::c99::{uint16_t, uint32_t};
 use png::PixelsByColorType;
-use servo_net::image::base::Image;
+use net::image::base::Image;
 use util::geometry::{Au, MAX_RECT};
 use util::opts;
 use util::range::Range;

servo/components/layout/context.rs

@@ -15,7 +15,7 @@ use gfx::font_cache_task::FontCacheTask;
 use script::layout_interface::LayoutChan;
 use script_traits::UntrustedNodeAddress;
 use msg::constellation_msg::ConstellationChan;
-use servo_net::local_image_cache::LocalImageCache;
+use net::local_image_cache::LocalImageCache;
 use servo_util::geometry::Au;
 use std::cell::Cell;
 use std::mem;

servo/components/layout/display_list_builder.rs

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

servo/components/layout/fragment.rs

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

servo/components/layout/layout_task.rs

@@ -48,9 +48,9 @@ use script_traits::{ScriptControlChan, UntrustedNodeAddress};
 use msg::compositor_msg::ScrollPolicy;
 use msg::constellation_msg::Msg as ConstellationMsg;
 use msg::constellation_msg::{ConstellationChan, Failure, PipelineExitType, PipelineId};
-use servo_net::image_cache_task::{ImageCacheTask, ImageResponseMsg};
-use servo_net::local_image_cache::{ImageResponder, LocalImageCache};
-use servo_net::resource_task::{ResourceTask, load_bytes_iter};
+use net::image_cache_task::{ImageCacheTask, ImageResponseMsg};
+use net::local_image_cache::{ImageResponder, LocalImageCache};
+use net::resource_task::{ResourceTask, load_bytes_iter};
 use servo_util::cursor::Cursor;
 use servo_util::geometry::Au;
 use servo_util::logical_geometry::LogicalPoint;

servo/components/layout/lib.rs

@@ -26,7 +26,7 @@ extern crate style;
 #[macro_use]
 #[no_link] #[plugin]
 extern crate "plugins" as servo_plugins;
-extern crate "net" as servo_net;
+extern crate net;
 extern crate msg;
 #[macro_use]
 extern crate "util" as servo_util;

servo/components/layout_traits/lib.rs

@@ -7,7 +7,7 @@
 extern crate gfx;
 extern crate script_traits;
 extern crate msg;
-extern crate "net" as servo_net;
+extern crate net;
 extern crate util;
 
 // This module contains traits in layout used generically
@@ -18,8 +18,8 @@ extern crate util;
 use gfx::font_cache_task::FontCacheTask;
 use gfx::paint_task::PaintChan;
 use msg::constellation_msg::{ConstellationChan, Failure, PipelineId, PipelineExitType};
-use servo_net::image_cache_task::ImageCacheTask;
-use servo_net::resource_task::ResourceTask;
+use net::image_cache_task::ImageCacheTask;
+use net::resource_task::ResourceTask;
 use util::time::TimeProfilerChan;
 use script_traits::{ScriptControlChan, OpaqueScriptLayoutChannel};
 use std::sync::mpsc::{Sender, Receiver};

servo/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};

servo/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};

servo/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;

servo/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;
 

servo/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;

servo/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;
 

servo/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;

servo/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;

servo/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;

servo/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;

servo/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;

servo/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;

servo/components/script_traits/lib.rs

@@ -11,7 +11,7 @@ extern crate devtools_traits;
 extern crate geom;
 extern crate libc;
 extern crate msg;
-extern crate "net" as servo_net;
+extern crate net;
 extern crate util;
 extern crate url;
 extern crate serialize;
@@ -27,9 +27,9 @@ use msg::constellation_msg::{ConstellationChan, PipelineId, Failure, WindowSizeD
 use msg::constellation_msg::{LoadData, SubpageId, Key, KeyState, KeyModifiers};
 use msg::constellation_msg::PipelineExitType;
 use msg::compositor_msg::ScriptListener;
-use servo_net::image_cache_task::ImageCacheTask;
-use servo_net::resource_task::ResourceTask;
-use servo_net::storage_task::StorageTask;
+use net::image_cache_task::ImageCacheTask;
+use net::resource_task::ResourceTask;
+use net::storage_task::StorageTask;
 use util::smallvec::SmallVec1;
 use std::any::Any;
 use std::sync::mpsc::{Sender, Receiver};

servo/components/servo/lib.rs

@@ -12,7 +12,7 @@ extern crate log;
 
 extern crate compositing;
 extern crate devtools;
-extern crate "net" as servo_net;
+extern crate net;
 extern crate msg;
 #[macro_use]
 extern crate util;
@@ -35,11 +35,11 @@ use msg::constellation_msg::ConstellationChan;
 use script::dom::bindings::codegen::RegisterBindings;
 
 #[cfg(not(test))]
-use servo_net::image_cache_task::ImageCacheTask;
+use net::image_cache_task::ImageCacheTask;
 #[cfg(not(test))]
-use servo_net::resource_task::new_resource_task;
+use net::resource_task::new_resource_task;
 #[cfg(not(test))]
-use servo_net::storage_task::{StorageTaskFactory, StorageTask};
+use net::storage_task::{StorageTaskFactory, StorageTask};
 #[cfg(not(test))]
 use gfx::font_cache_task::FontCacheTask;
 #[cfg(not(test))]

servo/components/servo/main.rs

@@ -10,7 +10,7 @@ extern crate libc;
 extern crate servo;
 extern crate time;
 extern crate util;
-extern crate "net" as servo_net;
+extern crate net;
 
 #[cfg(not(test))]
 extern crate "glutin_app" as app;
@@ -29,7 +29,7 @@ use libc::c_int;
 use util::opts;
 
 #[cfg(not(test))]
-use servo_net::resource_task;
+use net::resource_task;
 
 #[cfg(not(test))]
 use servo::Browser;

servo/ports/cef/lib.rs

@@ -24,7 +24,7 @@ extern crate layers;
 extern crate png;
 extern crate script;
 
-extern crate "net" as servo_net;
+extern crate net;
 extern crate msg;
 extern crate util;
 extern crate style;

servo/ports/gonk/src/lib.rs

@@ -11,7 +11,7 @@ extern crate log;
 
 extern crate compositing;
 extern crate devtools;
-extern crate "net" as servo_net;
+extern crate net;
 extern crate msg;
 #[macro_use]
 extern crate util;
@@ -34,11 +34,11 @@ use msg::constellation_msg::ConstellationChan;
 use script::dom::bindings::codegen::RegisterBindings;
 
 #[cfg(not(test))]
-use servo_net::image_cache_task::ImageCacheTask;
+use net::image_cache_task::ImageCacheTask;
 #[cfg(not(test))]
-use servo_net::storage_task::StorageTaskFactory;
+use net::storage_task::StorageTaskFactory;
 #[cfg(not(test))]
-use servo_net::resource_task::new_resource_task;
+use net::resource_task::new_resource_task;
 #[cfg(not(test))]
 use gfx::font_cache_task::FontCacheTask;
 #[cfg(not(test))]