Auto merge of #9498 - KiChjang:update-url, r=nox

Update rust-url

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9498)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-02-03 11:38:51 +05:30
commit 64ad9e17d9
28 changed files with 128 additions and 119 deletions

View file

@ -91,7 +91,7 @@ gleam = "0.2"
euclid = {version = "0.4", features = ["plugins"]}
serde = "0.6"
serde_macros = "0.6"
url = "0.5.2"
url = "0.5.4"
[target.x86_64-apple-darwin.dependencies]
core-graphics = "0.2"

View file

@ -26,5 +26,5 @@ rustc-serialize = "0.3"
bitflags = "0.3"
serde = "0.6"
serde_macros = "0.6"
url = "0.5.2"
url = "0.5.4"

View file

@ -26,7 +26,7 @@ smallvec = "0.1"
string_cache = "0.2"
time = "0.1.12"
unicode-script = { version = "0.1", features = ["harfbuzz"] }
url = "0.5.2"
url = "0.5.4"
servo-skia = "0.20130412.0"
[dependencies.plugins]

View file

@ -71,4 +71,4 @@ serde_json = "0.5"
time = "0.1"
unicode-bidi = "0.2"
unicode-script = { version = "0.1", features = ["harfbuzz"] }
url = "0.5.2"
url = "0.5.4"

View file

@ -31,4 +31,4 @@ git = "https://github.com/servo/ipc-channel"
[dependencies]
serde = "0.6"
serde_macros = "0.6"
url = "0.5.2"
url = "0.5.4"

View file

@ -28,4 +28,4 @@ rustc-serialize = "0.3.4"
euclid = {version = "0.4", features = ["plugins"]}
serde = "0.6"
serde_macros = "0.6"
url = "0.5.2"
url = "0.5.4"

View file

@ -38,6 +38,6 @@ cookie = "0.2"
mime_guess = "1.1.1"
flate2 = "0.2.0"
uuid = "0.1.16"
url = "0.5.2"
url = "0.5.4"
websocket = "0.14.0"
immeta = "0.2"

View file

@ -26,5 +26,5 @@ image = "0.5.0"
serde = "0.6"
serde_macros = "0.6"
stb_image = "0.2"
url = "0.5.2"
url = "0.5.4"
websocket = "0.14.0"

View file

@ -17,7 +17,7 @@ rev = "9dca15de3e8ea266d3e7e868c0f358ed4fa5f195"
optional = true
[dependencies]
url = "0.5.2"
url = "0.5.4"
[features]
default = []

View file

@ -86,5 +86,5 @@ rand = "0.3"
serde = "0.6"
caseless = "0.1.0"
image = "0.5.0"
url = "0.5.2"
url = "0.5.4"
ref_slice = "0.1.0"

View file

@ -47,4 +47,4 @@ euclid = {version = "0.4", features = ["plugins"]}
serde = "0.6"
serde_macros = "0.6"
time = "0.1.12"
url = "0.5.2"
url = "0.5.4"

View file

@ -36,7 +36,7 @@ dependencies = [
"script_traits 0.0.1",
"style 0.0.1",
"style_tests 0.0.1",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"util_tests 0.0.1",
"webdriver_server 0.0.1",
@ -181,7 +181,7 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"regex 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-normalization 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -269,7 +269,7 @@ dependencies = [
"serde_macros 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"style_traits 0.0.1",
"time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -281,7 +281,7 @@ dependencies = [
"openssl 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -380,7 +380,7 @@ dependencies = [
"serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -651,7 +651,7 @@ dependencies = [
"style 0.0.1",
"time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -726,7 +726,7 @@ dependencies = [
"script_traits 0.0.1",
"servo-egl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-glutin 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -837,7 +837,7 @@ dependencies = [
"traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"unicase 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -979,9 +979,9 @@ dependencies = [
"string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-bidi 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -997,7 +997,7 @@ dependencies = [
"script_traits 0.0.1",
"serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -1142,7 +1142,7 @@ dependencies = [
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -1165,7 +1165,7 @@ dependencies = [
"plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
"websocket 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1197,7 +1197,7 @@ dependencies = [
"net_traits 0.0.1",
"plugins 0.0.1",
"time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -1214,7 +1214,7 @@ dependencies = [
"serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"stb_image 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"websocket 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1372,7 +1372,7 @@ name = "plugin_tests"
version = "0.0.1"
dependencies = [
"plugins 0.0.1",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1380,7 +1380,7 @@ name = "plugins"
version = "0.0.1"
dependencies = [
"tenacious 0.0.15 (git+https://github.com/Manishearth/rust-tenacious)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1537,7 +1537,7 @@ dependencies = [
"style 0.0.1",
"time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"unicase 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
"websocket 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1573,7 +1573,7 @@ dependencies = [
"serde_macros 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"style_traits 0.0.1",
"time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -1789,7 +1789,7 @@ dependencies = [
"string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"style_traits 0.0.1",
"time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -1806,7 +1806,7 @@ dependencies = [
"string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"style_traits 0.0.1",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -1824,7 +1824,7 @@ dependencies = [
"selectors 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@ -1897,7 +1897,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "unicode-bidi"
version = "0.2.2"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1905,7 +1905,7 @@ dependencies = [
[[package]]
name = "unicode-normalization"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@ -1926,13 +1926,15 @@ dependencies = [
[[package]]
name = "url"
version = "0.5.2"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1982,7 +1984,7 @@ dependencies = [
"serde_macros 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -2088,7 +2090,7 @@ dependencies = [
"plugins 0.0.1",
"regex 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
"webdriver 0.4.0 (git+https://github.com/jgraham/webdriver-rust.git)",
@ -2107,7 +2109,7 @@ dependencies = [
"rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"unicase 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]

View file

@ -160,5 +160,5 @@ git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
env_logger = "0.3"
bitflags = "0.3"
libc = "0.2"
url = {version = "0.5.2", features = ["serde_serialization", "query_encoding"]}
url = {version = "0.5.4", features = ["serde_serialization", "query_encoding"]}
euclid = {version = "0.4", features = ["plugins"]}

View file

@ -36,5 +36,5 @@ euclid = {version = "0.4", features = ["plugins"]}
serde = "0.6"
serde_macros = "0.6"
time = "0.1"
url = "0.5.2"
url = "0.5.4"

View file

@ -23,5 +23,5 @@ rustc-serialize = "0.3"
selectors = "0.4.1"
serde = "0.6"
serde_macros = "0.6"
url = "0.5.2"
url = "0.5.4"

View file

@ -64,7 +64,7 @@ string_cache = "0.2"
lazy_static = "0.1"
getopts = "0.2.11"
hyper = { version = "0.7", optional = true }
url = {version = "0.5.2", features = ["serde_serialization"]}
url = {version = "0.5.4", features = ["serde_serialization"]}
uuid = "0.1.17"
[target.x86_64-pc-windows-gnu.dependencies]

View file

@ -31,5 +31,5 @@ log = "0.3"
hyper = "0.7"
rustc-serialize = "0.3.4"
regex = "0.1.33"
url = "0.5.2"
url = "0.5.4"
uuid = "0.1"