Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #15717 - nox:cookie, r=asajeffrey

Browse source 
Remove rustc-serialize from cookie and url

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15717)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-02-24 00:14:03 -08:00 • committed by GitHub
commit 0e33756e8d
6 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -2971,7 +2971,6 @@ dependencies = [
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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)", "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)", "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)", "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)", "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)", "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]] [[package]]

4
components/net/Cargo.toml
View file

@ -12,7 +12,7 @@ path = "lib.rs"
[dependencies] [dependencies]
brotli = "1.0.6" brotli = "1.0.6"
content-blocker = "0.2.3" content-blocker = "0.2.3"
cookie = {version = "0.2.5", features = ["serialize-rustc"]} cookie = "0.2.5"
devtools_traits = {path = "../devtools_traits"} devtools_traits = {path = "../devtools_traits"}
flate2 = "0.2.0" flate2 = "0.2.0"
hyper = "0.9.9" hyper = "0.9.9"
@ -38,7 +38,7 @@ servo_url = {path = "../url"}
threadpool = "1.0" threadpool = "1.0"
time = "0.1.17" time = "0.1.17"
unicase = "1.4.0" 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"]} uuid = {version = "0.4", features = ["v4"]}
websocket = "0.17" websocket = "0.17"

2
components/net_traits/Cargo.toml
View file

@ -10,7 +10,7 @@ name = "net_traits"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]
cookie = {version = "0.2.5", features = ["serialize-rustc"]} cookie = "0.2.5"
heapsize = "0.3.0" heapsize = "0.3.0"
heapsize_derive = "0.1" heapsize_derive = "0.1"
hyper = "0.9.9" hyper = "0.9.9"

2
components/script/Cargo.toml
View file

@ -33,7 +33,7 @@ bluetooth_traits = {path = "../bluetooth_traits"}
byteorder = "1.0" byteorder = "1.0"
canvas_traits = {path = "../canvas_traits"} canvas_traits = {path = "../canvas_traits"}
caseless = "0.1.0" caseless = "0.1.0"
cookie = {version = "0.2.5", features = ["serialize-rustc"]} cookie = "0.2.5"
cssparser = {version = "0.10", features = ["heapsize", "serde"]} cssparser = {version = "0.10", features = ["heapsize", "serde"]}
deny_public_fields = {path = "../deny_public_fields"} deny_public_fields = {path = "../deny_public_fields"}
devtools_traits = {path = "../devtools_traits"} devtools_traits = {path = "../devtools_traits"}

2
components/script_traits/Cargo.toml
View file

@ -13,7 +13,7 @@ path = "lib.rs"
app_units = "0.4" app_units = "0.4"
bluetooth_traits = {path = "../bluetooth_traits"} bluetooth_traits = {path = "../bluetooth_traits"}
canvas_traits = {path = "../canvas_traits"} canvas_traits = {path = "../canvas_traits"}
cookie = {version = "0.2.5", features = ["serialize-rustc"]} cookie = "0.2.5"
devtools_traits = {path = "../devtools_traits"} devtools_traits = {path = "../devtools_traits"}
euclid = "0.11" euclid = "0.11"
gfx_traits = {path = "../gfx_traits"} gfx_traits = {path = "../gfx_traits"}

2
components/webdriver_server/Cargo.toml
View file

@ -10,7 +10,7 @@ name = "webdriver_server"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]
cookie = {version = "0.2.5", features = ["serialize-rustc"]} cookie = "0.2.5"
euclid = "0.11" euclid = "0.11"
hyper = "0.9.9" hyper = "0.9.9"
image = "0.12" image = "0.12"