From b526214a3d5b77a9d4e3a55325936be75e196372 Mon Sep 17 00:00:00 2001 From: Connor Imes Date: Thu, 6 Aug 2015 16:11:20 -0500 Subject: [PATCH] Move net_error_list from net to net_traits. Fixes #7050. --- components/compositing/Cargo.toml | 3 --- components/compositing/lib.rs | 1 - components/compositing/windowing.rs | 2 +- components/net/lib.rs | 1 - components/net_traits/lib.rs | 1 + components/{net => net_traits}/net_error_list.rs | 0 components/servo/Cargo.lock | 3 +-- ports/cef/Cargo.lock | 7 ++++--- ports/cef/Cargo.toml | 4 ++-- ports/cef/lib.rs | 2 +- ports/cef/types.rs | 2 +- ports/cef/window.rs | 2 +- ports/glutin/Cargo.toml | 4 ++-- ports/glutin/lib.rs | 2 +- ports/glutin/window.rs | 2 +- ports/gonk/Cargo.lock | 4 ++-- ports/gonk/Cargo.toml | 3 --- ports/gonk/src/main.rs | 1 - ports/gonk/src/window.rs | 2 +- 19 files changed, 19 insertions(+), 27 deletions(-) rename components/{net => net_traits}/net_error_list.rs (100%) diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index e3ec5f2ed24..d57b9c1f472 100644 --- a/components/compositing/Cargo.toml +++ b/components/compositing/Cargo.toml @@ -22,9 +22,6 @@ path = "../script_traits" [dependencies.msg] path = "../msg" -[dependencies.net] -path = "../net" - [dependencies.profile_traits] path = "../profile_traits" diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs index 0cdafd6af59..5c0982cb706 100644 --- a/components/compositing/lib.rs +++ b/components/compositing/lib.rs @@ -23,7 +23,6 @@ extern crate offscreen_gl_context; extern crate png; extern crate script_traits; extern crate msg; -extern crate net; extern crate num; #[macro_use] extern crate profile_traits; diff --git a/components/compositing/windowing.rs b/components/compositing/windowing.rs index 6ad7790edaa..5e815f79677 100644 --- a/components/compositing/windowing.rs +++ b/components/compositing/windowing.rs @@ -12,7 +12,7 @@ use euclid::size::TypedSize2D; use layers::geometry::DevicePixel; use layers::platform::surface::NativeDisplay; use msg::constellation_msg::{Key, KeyState, KeyModifiers}; -use net::net_error_list::NetError; +use net_traits::net_error_list::NetError; use script_traits::MouseButton; use url::Url; use util::cursor::Cursor; diff --git a/components/net/lib.rs b/components/net/lib.rs index 20b3c973861..5c9378114fe 100644 --- a/components/net/lib.rs +++ b/components/net/lib.rs @@ -33,7 +33,6 @@ pub mod data_loader; pub mod cookie; pub mod cookie_storage; pub mod image_cache_task; -pub mod net_error_list; pub mod pub_domains; pub mod resource_task; pub mod hsts; diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs index 3e586ddffb6..e4cdb2538f0 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -40,6 +40,7 @@ use std::thread; pub mod hosts; pub mod image_cache_task; +pub mod net_error_list; pub mod storage_task; pub static IPV4_REGEX: Regex = regex!( diff --git a/components/net/net_error_list.rs b/components/net_traits/net_error_list.rs similarity index 100% rename from components/net/net_error_list.rs rename to components/net_traits/net_error_list.rs diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 7d655d91ebe..d863f63d24a 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -181,7 +181,6 @@ dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "net 0.0.1", "net_traits 0.0.1", "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)", @@ -567,7 +566,7 @@ dependencies = [ "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "net 0.0.1", + "net_traits 0.0.1", "script_traits 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index d292fe6f558..1d3157577cb 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -19,7 +19,7 @@ dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "net 0.0.1", + "net_traits 0.0.1", "objc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "png 0.1.0 (git+https://github.com/servo/rust-png)", @@ -185,7 +185,6 @@ dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "net 0.0.1", "net_traits 0.0.1", "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)", @@ -564,7 +563,7 @@ dependencies = [ "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "net 0.0.1", + "net_traits 0.0.1", "script_traits 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -894,6 +893,8 @@ dependencies = [ "net_traits 0.0.1", "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "png 0.1.0 (git+https://github.com/servo/rust-png)", + "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", + "regex_macros 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.toml b/ports/cef/Cargo.toml index 2c3ce8bc4a6..7f9515bd3b9 100644 --- a/ports/cef/Cargo.toml +++ b/ports/cef/Cargo.toml @@ -36,8 +36,8 @@ path = "../../components/script" [dependencies.script_traits] path = "../../components/script_traits" -[dependencies.net] -path = "../../components/net" +[dependencies.net_traits] +path = "../../components/net_traits" [dependencies.msg] path = "../../components/msg" diff --git a/ports/cef/lib.rs b/ports/cef/lib.rs index f92b5adeaf8..a68486fc16b 100644 --- a/ports/cef/lib.rs +++ b/ports/cef/lib.rs @@ -37,7 +37,7 @@ extern crate rustc_unicode; extern crate script; extern crate script_traits; -extern crate net; +extern crate net_traits; extern crate msg; extern crate util; extern crate style; diff --git a/ports/cef/types.rs b/ports/cef/types.rs index be71083f1ed..2c9ba1852ef 100644 --- a/ports/cef/types.rs +++ b/ports/cef/types.rs @@ -9,7 +9,7 @@ use libc::c_ulong; use libc::c_void; use libc::types::os::arch::c95::wchar_t; -use net::net_error_list::NetError; +use net_traits::net_error_list::NetError; pub use self::cef_rect as cef_rect_t; diff --git a/ports/cef/window.rs b/ports/cef/window.rs index 0a65da35a86..2298958e455 100644 --- a/ports/cef/window.rs +++ b/ports/cef/window.rs @@ -24,7 +24,7 @@ use layers::geometry::DevicePixel; use layers::platform::surface::NativeDisplay; use libc::{c_char, c_void}; use msg::constellation_msg::{Key, KeyModifiers}; -use net::net_error_list::NetError; +use net_traits::net_error_list::NetError; use std::ptr; use std_url::Url; use util::cursor::Cursor; diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml index 3b3a54df844..77475098808 100644 --- a/ports/glutin/Cargo.toml +++ b/ports/glutin/Cargo.toml @@ -31,8 +31,8 @@ git = "https://github.com/servo/rust-layers" [dependencies.msg] path = "../../components/msg" -[dependencies.net] -path = "../../components/net" +[dependencies.net_traits] +path = "../../components/net_traits" [dependencies.util] path = "../../components/util" diff --git a/ports/glutin/lib.rs b/ports/glutin/lib.rs index b243ec6ff49..3aefb344456 100644 --- a/ports/glutin/lib.rs +++ b/ports/glutin/lib.rs @@ -15,7 +15,7 @@ extern crate glutin; extern crate layers; extern crate libc; extern crate msg; -extern crate net; +extern crate net_traits; #[cfg(feature = "window")] extern crate script_traits; extern crate time; extern crate util; diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs index 0e28d1abd85..cb78e9df582 100644 --- a/ports/glutin/window.rs +++ b/ports/glutin/window.rs @@ -14,7 +14,7 @@ use layers::geometry::DevicePixel; use layers::platform::surface::NativeDisplay; use msg::constellation_msg; use msg::constellation_msg::Key; -use net::net_error_list::NetError; +use net_traits::net_error_list::NetError; use std::rc::Rc; use std::sync::mpsc::{channel, Sender}; use url::Url; diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 04b5e92eda8..6adba1497a0 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -14,7 +14,6 @@ dependencies = [ "layout 0.0.1", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "net 0.0.1", "net_traits 0.0.1", "profile 0.0.1", "script 0.0.1", @@ -156,7 +155,6 @@ dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "net 0.0.1", "net_traits 0.0.1", "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)", @@ -814,6 +812,8 @@ dependencies = [ "net_traits 0.0.1", "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "png 0.1.0 (git+https://github.com/servo/rust-png)", + "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", + "regex_macros 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.toml b/ports/gonk/Cargo.toml index 5599827516b..b81f8bbc1f2 100644 --- a/ports/gonk/Cargo.toml +++ b/ports/gonk/Cargo.toml @@ -20,9 +20,6 @@ path = "../../components/script" [dependencies.script_traits] path = "../../components/script_traits" -[dependencies.net] -path = "../../components/net" - [dependencies.net_traits] path = "../../components/net_traits" diff --git a/ports/gonk/src/main.rs b/ports/gonk/src/main.rs index 62e7be00eb0..b8306f3a371 100644 --- a/ports/gonk/src/main.rs +++ b/ports/gonk/src/main.rs @@ -38,7 +38,6 @@ extern crate gleam; extern crate layers; extern crate egl; extern crate url; -extern crate net; extern crate net_traits; extern crate env_logger; diff --git a/ports/gonk/src/window.rs b/ports/gonk/src/window.rs index 88ba3ceca96..0b2a9840422 100644 --- a/ports/gonk/src/window.rs +++ b/ports/gonk/src/window.rs @@ -12,7 +12,7 @@ use layers::geometry::DevicePixel; use layers::platform::surface::NativeDisplay; use libc::c_int; use msg::constellation_msg::{Key, KeyModifiers}; -use net::net_error_list::NetError; +use net_traits::net_error_list::NetError; use std::sync::mpsc::{channel, Sender, Receiver}; use std::rc::Rc; use std::mem::transmute;