From 3ad540853c62659c68e9c8105a1382cfa2445371 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 24 Feb 2017 02:39:57 +0100 Subject: [PATCH 1/2] Remove rustc-serialize from cookie --- Cargo.lock | 1 - components/net/Cargo.toml | 2 +- components/net_traits/Cargo.toml | 2 +- components/script/Cargo.toml | 2 +- components/script_traits/Cargo.toml | 2 +- components/webdriver_server/Cargo.toml | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2c395502984..1837b6c5ad5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2973,7 +2973,6 @@ dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 2252c765541..47fe30bbf48 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -12,7 +12,7 @@ path = "lib.rs" [dependencies] brotli = "1.0.6" content-blocker = "0.2.3" -cookie = {version = "0.2.5", features = ["serialize-rustc"]} +cookie = "0.2.5" devtools_traits = {path = "../devtools_traits"} flate2 = "0.2.0" hyper = "0.9.9" diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml index b7f512dd336..c571d850701 100644 --- a/components/net_traits/Cargo.toml +++ b/components/net_traits/Cargo.toml @@ -10,7 +10,7 @@ name = "net_traits" path = "lib.rs" [dependencies] -cookie = {version = "0.2.5", features = ["serialize-rustc"]} +cookie = "0.2.5" heapsize = "0.3.0" heapsize_derive = "0.1" hyper = "0.9.9" diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index eb737dfb2b6..5cf5dd5367e 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -33,7 +33,7 @@ bluetooth_traits = {path = "../bluetooth_traits"} byteorder = "1.0" canvas_traits = {path = "../canvas_traits"} caseless = "0.1.0" -cookie = {version = "0.2.5", features = ["serialize-rustc"]} +cookie = "0.2.5" cssparser = {version = "0.10", features = ["heapsize", "serde"]} deny_public_fields = {path = "../deny_public_fields"} devtools_traits = {path = "../devtools_traits"} diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml index 4d5991074eb..3986d56c120 100644 --- a/components/script_traits/Cargo.toml +++ b/components/script_traits/Cargo.toml @@ -13,7 +13,7 @@ path = "lib.rs" app_units = "0.4" bluetooth_traits = {path = "../bluetooth_traits"} canvas_traits = {path = "../canvas_traits"} -cookie = {version = "0.2.5", features = ["serialize-rustc"]} +cookie = "0.2.5" devtools_traits = {path = "../devtools_traits"} euclid = "0.11" gfx_traits = {path = "../gfx_traits"} diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml index 689ddf039a4..e84f1ff0662 100644 --- a/components/webdriver_server/Cargo.toml +++ b/components/webdriver_server/Cargo.toml @@ -10,7 +10,7 @@ name = "webdriver_server" path = "lib.rs" [dependencies] -cookie = {version = "0.2.5", features = ["serialize-rustc"]} +cookie = "0.2.5" euclid = "0.11" hyper = "0.9.9" image = "0.12" From 2efa5092da00ddc009153cef21196fce95bdd697 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 24 Feb 2017 02:48:42 +0100 Subject: [PATCH 2/2] Remove rustc-serialize from url --- Cargo.lock | 1 - components/net/Cargo.toml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1837b6c5ad5..c2ca8d1b5e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3066,7 +3066,6 @@ dependencies = [ "heapsize 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 47fe30bbf48..b938a5f4066 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -38,7 +38,7 @@ servo_url = {path = "../url"} threadpool = "1.0" time = "0.1.17" unicase = "1.4.0" -url = {version = "1.2", features = ["heap_size", "rustc-serialize"]} +url = {version = "1.2", features = ["heap_size"]} uuid = {version = "0.4", features = ["v4"]} websocket = "0.17"