зеркало из https://github.com/mozilla/gecko-dev.git
servo: Merge #7053 - Move net_error_list from net to net_traits. Fixes #7050 (from connorimes:move-net-error-list); r=mbrubeck
Source-Repo: https://github.com/servo/servo Source-Revision: 44c4bb00c1cb8645ee2fc303848a5136108e594f --HG-- rename : servo/components/net/net_error_list.rs => servo/components/net_traits/net_error_list.rs
This commit is contained in:
Родитель
2eb8f4c179
Коммит
98496efd1b
|
@ -22,9 +22,6 @@ path = "../script_traits"
|
|||
[dependencies.msg]
|
||||
path = "../msg"
|
||||
|
||||
[dependencies.net]
|
||||
path = "../net"
|
||||
|
||||
[dependencies.profile_traits]
|
||||
path = "../profile_traits"
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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!(
|
||||
|
|
|
@ -180,7 +180,6 @@ dependencies = [
|
|||
"layout_traits 0.0.1",
|
||||
"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)",
|
||||
|
@ -566,7 +565,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)",
|
||||
|
|
|
@ -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)",
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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)",
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче