From 6e466a6732d3775ebfe596c9e6ba7fb073074b95 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Fri, 24 Feb 2017 00:14:03 -0800
Subject: [PATCH] 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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : a30495f6d5cbfcf4668334eb7289b675a5012927
---
 servo/Cargo.lock                             | 2 --
 servo/components/net/Cargo.toml              | 4 ++--
 servo/components/net_traits/Cargo.toml       | 2 +-
 servo/components/script/Cargo.toml           | 2 +-
 servo/components/script_traits/Cargo.toml    | 2 +-
 servo/components/webdriver_server/Cargo.toml | 2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/servo/Cargo.lock b/servo/Cargo.lock
index 850dd525aa30..dffa8a7b0676 100644
--- a/servo/Cargo.lock
+++ b/servo/Cargo.lock
@@ -2971,7 +2971,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)",
 ]
 
@@ -3065,7 +3064,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/servo/components/net/Cargo.toml b/servo/components/net/Cargo.toml
index 2252c7655415..b938a5f4066c 100644
--- a/servo/components/net/Cargo.toml
+++ b/servo/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"
@@ -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"
 
diff --git a/servo/components/net_traits/Cargo.toml b/servo/components/net_traits/Cargo.toml
index b7f512dd336d..c571d8507012 100644
--- a/servo/components/net_traits/Cargo.toml
+++ b/servo/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/servo/components/script/Cargo.toml b/servo/components/script/Cargo.toml
index eb737dfb2b6a..5cf5dd5367e0 100644
--- a/servo/components/script/Cargo.toml
+++ b/servo/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/servo/components/script_traits/Cargo.toml b/servo/components/script_traits/Cargo.toml
index 4d5991074ebd..3986d56c1201 100644
--- a/servo/components/script_traits/Cargo.toml
+++ b/servo/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/servo/components/webdriver_server/Cargo.toml b/servo/components/webdriver_server/Cargo.toml
index 689ddf039a4c..e84f1ff0662d 100644
--- a/servo/components/webdriver_server/Cargo.toml
+++ b/servo/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"