servo: Merge #15717 - Remove rustc-serialize from cookie and url (from nox:cookie); r=asajeffrey
authorAnthony Ramine <n.oxyde@gmail.com>
Fri, 24 Feb 2017 00:14:03 -0800
changeset 373714 2f37bb06b731305284ef4a4e760a2b7dff2ea9ad
parent 373713 9c05f32dd0b1fff119c5bf698704d8d206957931
child 373715 9d135a51856f1432c902d51bc8805a6609c3b3b1
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersasajeffrey
bugs15717
milestone54.0a1
servo: Merge #15717 - Remove rustc-serialize from cookie and url (from nox:cookie); r=asajeffrey Source-Repo: https://github.com/servo/servo Source-Revision: 0e33756e8dff3215960b590cb577152cf0eeea96
servo/Cargo.lock
servo/components/net/Cargo.toml
servo/components/net_traits/Cargo.toml
servo/components/script/Cargo.toml
servo/components/script_traits/Cargo.toml
servo/components/webdriver_server/Cargo.toml
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -2966,17 +2966,16 @@ source = "registry+https://github.com/ru
 [[package]]
 name = "time"
 version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 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)",
 ]
 
 [[package]]
 name = "tinyfiledialogs"
 version = "2.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
@@ -3060,17 +3059,16 @@ dependencies = [
 name = "url"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "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]]
 name = "url_serde"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/servo/components/net/Cargo.toml
+++ b/servo/components/net/Cargo.toml
@@ -7,17 +7,17 @@ publish = false
 
 [lib]
 name = "net"
 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"
 hyper_serde = "0.5"
 immeta = "0.3.1"
 ipc-channel = "0.7"
 lazy_static = "0.2"
 log = "0.3.5"
@@ -33,17 +33,17 @@ rustc-serialize = "0.3"
 serde = "0.9"
 serde_derive = "0.9"
 serde_json = "0.9"
 servo_config = {path = "../config"}
 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"
 
 [dependencies.webrender_traits]
 git = "https://github.com/servo/webrender"
 default-features = false
 features = ["serde_derive", "ipc"]
 
--- a/servo/components/net_traits/Cargo.toml
+++ b/servo/components/net_traits/Cargo.toml
@@ -5,17 +5,17 @@ authors = ["The Servo Project Developers
 license = "MPL-2.0"
 publish = false
 
 [lib]
 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"
 hyper_serde = "0.5"
 image = "0.12"
 ipc-channel = "0.7"
 lazy_static = "0.2"
 log = "0.3.5"
--- a/servo/components/script/Cargo.toml
+++ b/servo/components/script/Cargo.toml
@@ -28,17 +28,17 @@ angle = {git = "https://github.com/servo
 app_units = "0.4"
 audio-video-metadata = "0.1.2"
 atomic_refcell = "0.1"
 bitflags = "0.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"}
 domobject_derive = {path = "../domobject_derive"}
 encoding = "0.2"
 euclid = "0.11"
 fnv = "1.0"
 gfx_traits = {path = "../gfx_traits"}
--- a/servo/components/script_traits/Cargo.toml
+++ b/servo/components/script_traits/Cargo.toml
@@ -8,17 +8,17 @@ publish = false
 [lib]
 name = "script_traits"
 path = "lib.rs"
 
 [dependencies]
 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"}
 heapsize = "0.3.0"
 heapsize_derive = "0.1"
 hyper = "0.9.9"
 hyper_serde = "0.5"
 ipc-channel = "0.7"
--- a/servo/components/webdriver_server/Cargo.toml
+++ b/servo/components/webdriver_server/Cargo.toml
@@ -5,17 +5,17 @@ authors = ["The Servo Project Developers
 license = "MPL-2.0"
 publish = false
 
 [lib]
 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"
 ipc-channel = "0.7"
 log = "0.3.5"
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
 regex = "0.2"