From a09a91217846339c5834162415df07df646e3eb1 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 10 Feb 2015 12:16:11 +0100 Subject: [PATCH] Import net as net rather than servo_net. --- components/compositing/constellation.rs | 8 ++++---- components/compositing/lib.rs | 2 +- components/compositing/pipeline.rs | 6 +++--- components/gfx/display_list/mod.rs | 2 +- components/gfx/font_cache_task.rs | 2 +- components/gfx/lib.rs | 2 +- components/gfx/paint_context.rs | 2 +- components/layout/context.rs | 2 +- components/layout/display_list_builder.rs | 2 +- components/layout/fragment.rs | 4 ++-- components/layout/layout_task.rs | 6 +++--- components/layout/lib.rs | 2 +- components/layout_traits/lib.rs | 6 +++--- components/script/dom/bindings/global.rs | 2 +- components/script/dom/dedicatedworkerglobalscope.rs | 2 +- components/script/dom/htmlimageelement.rs | 2 +- components/script/dom/htmlobjectelement.rs | 4 ++-- components/script/dom/htmlscriptelement.rs | 2 +- components/script/dom/storage.rs | 4 ++-- components/script/dom/window.rs | 4 ++-- components/script/dom/workerglobalscope.rs | 2 +- components/script/lib.rs | 1 - components/script/page.rs | 4 ++-- components/script/parse/html.rs | 2 +- components/script/script_task.rs | 8 ++++---- components/script_traits/lib.rs | 8 ++++---- components/servo/lib.rs | 8 ++++---- components/servo/main.rs | 4 ++-- ports/cef/lib.rs | 2 +- ports/gonk/src/lib.rs | 8 ++++---- 30 files changed, 56 insertions(+), 57 deletions(-) diff --git a/components/compositing/constellation.rs b/components/compositing/constellation.rs index f93b9097109..c8ab30b92aa 100644 --- a/components/compositing/constellation.rs +++ b/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; diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs index 5ec23894bd2..5e9933d041d 100644 --- a/components/compositing/lib.rs +++ b/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; diff --git a/components/compositing/pipeline.rs b/components/compositing/pipeline.rs index e1043f5b501..9bb29db622f 100644 --- a/components/compositing/pipeline.rs +++ b/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}; diff --git a/components/gfx/display_list/mod.rs b/components/gfx/display_list/mod.rs index 8454dc16810..d9317eef287 100644 --- a/components/gfx/display_list/mod.rs +++ b/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}; diff --git a/components/gfx/font_cache_task.rs b/components/gfx/font_cache_task.rs index 5e48eabb409..bed8fee8f59 100644 --- a/components/gfx/font_cache_task.rs +++ b/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; diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs index ae69e50dfbf..540ca27067a 100644 --- a/components/gfx/lib.rs +++ b/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; diff --git a/components/gfx/paint_context.rs b/components/gfx/paint_context.rs index 64495418ffe..cf564ed1b78 100644 --- a/components/gfx/paint_context.rs +++ b/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; diff --git a/components/layout/context.rs b/components/layout/context.rs index 046ec18a441..d5647c93a4e 100644 --- a/components/layout/context.rs +++ b/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; diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs index 9510e039951..2f53c671783 100644 --- a/components/layout/display_list_builder.rs +++ b/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}; diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 89ce3c1958a..4447ba1fa49 100644 --- a/components/layout/fragment.rs +++ b/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::*; diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs index e92f7ae9469..fb6f14fe57b 100644 --- a/components/layout/layout_task.rs +++ b/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; diff --git a/components/layout/lib.rs b/components/layout/lib.rs index d1747bcb751..fbd0b9c90f8 100644 --- a/components/layout/lib.rs +++ b/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; diff --git a/components/layout_traits/lib.rs b/components/layout_traits/lib.rs index bfad2637f96..788032169be 100644 --- a/components/layout_traits/lib.rs +++ b/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}; 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; diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index efe4257b887..895f290da2b 100644 --- a/components/script_traits/lib.rs +++ b/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}; diff --git a/components/servo/lib.rs b/components/servo/lib.rs index ab1b98e20bb..005514b5757 100644 --- a/components/servo/lib.rs +++ b/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))] diff --git a/components/servo/main.rs b/components/servo/main.rs index 1597dc37f76..b8bcb0f77fa 100644 --- a/components/servo/main.rs +++ b/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; diff --git a/ports/cef/lib.rs b/ports/cef/lib.rs index dd22106f41e..d8046f504fa 100644 --- a/ports/cef/lib.rs +++ b/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; diff --git a/ports/gonk/src/lib.rs b/ports/gonk/src/lib.rs index 7eb80cbee01..d3d729481bb 100644 --- a/ports/gonk/src/lib.rs +++ b/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))]