diff --git a/servo/components/net/Cargo.toml b/servo/components/net/Cargo.toml index 81795b40ae46..f8c9a6bb5ea0 100644 --- a/servo/components/net/Cargo.toml +++ b/servo/components/net/Cargo.toml @@ -44,5 +44,5 @@ rustc-serialize = "0.3" threadpool = "1.0" time = "0.1.17" url = {version = "0.5.7", features = ["heap_size"]} -uuid = "0.1.16" +uuid = { version = "0.2", features = ["v4"] } websocket = "0.16.1" diff --git a/servo/components/net/http_loader.rs b/servo/components/net/http_loader.rs index 52f56d1d1cc8..3f92339a373c 100644 --- a/servo/components/net/http_loader.rs +++ b/servo/components/net/http_loader.rs @@ -759,7 +759,7 @@ pub fn load(load_data: LoadData, load_data.preserved_headers.clone() }; - let request_id = uuid::Uuid::new_v4().to_simple_string(); + let request_id = uuid::Uuid::new_v4().simple().to_string(); modify_request_headers(&mut request_headers, &doc_url, &user_agent, &http_state.cookie_jar, diff --git a/servo/components/script/Cargo.toml b/servo/components/script/Cargo.toml index fb90edec2674..6a8a5d1b25ec 100644 --- a/servo/components/script/Cargo.toml +++ b/servo/components/script/Cargo.toml @@ -95,5 +95,5 @@ string_cache = {version = "0.2.11", features = ["heap_size", "unstable"]} time = "0.1.12" unicase = "1.0" url = {version = "0.5.7", features = ["heap_size"]} -uuid = "0.1.16" +uuid = { version = "0.2", features = ["v4"] } websocket = "0.16.1" diff --git a/servo/components/script/dom/node.rs b/servo/components/script/dom/node.rs index 39ad21a46b69..996483693570 100644 --- a/servo/components/script/dom/node.rs +++ b/servo/components/script/dom/node.rs @@ -799,7 +799,7 @@ impl Node { } pub fn unique_id(&self) -> String { - self.unique_id.borrow().to_simple_string() + self.unique_id.borrow().simple().to_string() } pub fn summarize(&self) -> NodeInfo { diff --git a/servo/components/servo/Cargo.lock b/servo/components/servo/Cargo.lock index eb412f12751f..122dca34ba6a 100644 --- a/servo/components/servo/Cargo.lock +++ b/servo/components/servo/Cargo.lock @@ -40,7 +40,7 @@ dependencies = [ "script_traits 0.0.1", "style 0.0.1", "style_tests 0.0.1", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "util_tests 0.0.1", "webdriver_server 0.0.1", @@ -319,7 +319,7 @@ dependencies = [ "serde_macros 0.7.0 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender 0.1.0 (git+https://github.com/servo/webrender)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", @@ -333,7 +333,7 @@ dependencies = [ "openssl 0.7.8 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -438,7 +438,7 @@ dependencies = [ "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -719,7 +719,7 @@ dependencies = [ "style_traits 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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -797,7 +797,7 @@ dependencies = [ "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-glutin 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (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)", ] @@ -919,7 +919,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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1081,7 +1081,7 @@ dependencies = [ "time 0.1.34 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -1105,7 +1105,7 @@ dependencies = [ "script_traits 0.0.1", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -1269,7 +1269,7 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -1294,9 +1294,9 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "threadpool 1.0.0 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (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)", + "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1328,7 +1328,7 @@ dependencies = [ "plugins 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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1347,7 +1347,7 @@ dependencies = [ "plugins 0.0.1", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "websocket 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1524,7 +1524,7 @@ name = "plugin_tests" version = "0.0.1" dependencies = [ "plugins 0.0.1", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1532,7 +1532,7 @@ name = "plugins" version = "0.0.1" dependencies = [ "tenacious 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1738,9 +1738,9 @@ 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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (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)", + "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.1 (git+https://github.com/Ygg01/xml5ever)", @@ -1777,7 +1777,7 @@ dependencies = [ "serde_macros 0.7.0 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1992,7 +1992,7 @@ dependencies = [ "string_cache 0.2.11 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -2009,7 +2009,7 @@ dependencies = [ "string_cache 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -2029,7 +2029,7 @@ dependencies = [ "selectors 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -2136,7 +2136,7 @@ dependencies = [ [[package]] name = "url" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2147,7 +2147,7 @@ dependencies = [ "serde 0.7.0 (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)", + "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2197,7 +2197,7 @@ dependencies = [ "serde_macros 0.7.0 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2211,15 +2211,6 @@ dependencies = [ "util 0.0.1", ] -[[package]] -name = "uuid" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "uuid" version = "0.2.0" @@ -2308,9 +2299,9 @@ dependencies = [ "plugins 0.0.1", "regex 0.1.55 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (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)", + "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "webdriver 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2365,7 +2356,7 @@ dependencies = [ "rand 0.3.14 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/servo/components/webdriver_server/Cargo.toml b/servo/components/webdriver_server/Cargo.toml index 720d7689c255..547ae03fc8e7 100644 --- a/servo/components/webdriver_server/Cargo.toml +++ b/servo/components/webdriver_server/Cargo.toml @@ -30,5 +30,5 @@ hyper = "0.8" rustc-serialize = "0.3.4" regex = "0.1.55" url = {version = "0.5.7", features = ["heap_size"]} -uuid = "0.1" +uuid = { version = "0.2", features = ["v4"] } webdriver = "0.8" diff --git a/servo/ports/cef/Cargo.lock b/servo/ports/cef/Cargo.lock index 369a845bfd9d..19a76595c6a5 100644 --- a/servo/ports/cef/Cargo.lock +++ b/servo/ports/cef/Cargo.lock @@ -27,7 +27,7 @@ dependencies = [ "servo 0.0.1", "style 0.0.1", "style_traits 0.0.1", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (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)", ] @@ -288,7 +288,7 @@ dependencies = [ "serde_macros 0.7.0 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender 0.1.0 (git+https://github.com/servo/webrender)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", @@ -302,7 +302,7 @@ dependencies = [ "openssl 0.7.8 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -407,7 +407,7 @@ dependencies = [ "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -647,7 +647,7 @@ dependencies = [ "style_traits 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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -716,7 +716,7 @@ dependencies = [ "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-glutin 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (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)", ] @@ -838,7 +838,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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1000,7 +1000,7 @@ dependencies = [ "time 0.1.34 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -1017,7 +1017,7 @@ dependencies = [ "script_traits 0.0.1", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -1181,7 +1181,7 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -1206,9 +1206,9 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "threadpool 1.0.0 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (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)", + "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1240,7 +1240,7 @@ dependencies = [ "plugins 0.0.1", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "websocket 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1401,7 +1401,7 @@ name = "plugins" version = "0.0.1" dependencies = [ "tenacious 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1605,9 +1605,9 @@ 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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (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)", + "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.1 (git+https://github.com/Ygg01/xml5ever)", @@ -1635,7 +1635,7 @@ dependencies = [ "serde_macros 0.7.0 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1723,7 +1723,7 @@ dependencies = [ "script 0.0.1", "script_traits 0.0.1", "style 0.0.1", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webdriver_server 0.0.1", "webrender 0.1.0 (git+https://github.com/servo/webrender)", @@ -1888,7 +1888,7 @@ dependencies = [ "string_cache 0.2.11 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1908,7 +1908,7 @@ dependencies = [ "selectors 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -2015,7 +2015,7 @@ dependencies = [ [[package]] name = "url" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2026,7 +2026,7 @@ dependencies = [ "serde 0.7.0 (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)", + "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2076,16 +2076,7 @@ dependencies = [ "serde_macros 0.7.0 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "uuid" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand 0.3.14 (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.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2176,9 +2167,9 @@ dependencies = [ "plugins 0.0.1", "regex 0.1.55 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (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)", + "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "webdriver 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2233,7 +2224,7 @@ dependencies = [ "rand 0.3.14 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/servo/ports/geckolib/Cargo.lock b/servo/ports/geckolib/Cargo.lock index 2102a17139f7..1922eb39a22c 100644 --- a/servo/ports/geckolib/Cargo.lock +++ b/servo/ports/geckolib/Cargo.lock @@ -17,7 +17,7 @@ dependencies = [ "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -273,7 +273,7 @@ name = "plugins" version = "0.0.1" dependencies = [ "tenacious 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -402,7 +402,7 @@ dependencies = [ "string_cache 0.2.11 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -422,7 +422,7 @@ dependencies = [ "selectors 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -464,7 +464,7 @@ dependencies = [ [[package]] name = "url" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -475,7 +475,7 @@ dependencies = [ "serde 0.7.0 (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)", + "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -502,16 +502,7 @@ dependencies = [ "serde_macros 0.7.0 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "uuid" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand 0.3.14 (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.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/servo/ports/gonk/Cargo.lock b/servo/ports/gonk/Cargo.lock index 4a94a0f8988c..b741ead8af2a 100644 --- a/servo/ports/gonk/Cargo.lock +++ b/servo/ports/gonk/Cargo.lock @@ -21,7 +21,7 @@ dependencies = [ "servo-egl 0.2.1 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -281,7 +281,7 @@ dependencies = [ "serde_macros 0.7.0 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender 0.1.0 (git+https://github.com/servo/webrender)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", @@ -295,7 +295,7 @@ dependencies = [ "openssl 0.7.8 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -400,7 +400,7 @@ dependencies = [ "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -650,7 +650,7 @@ dependencies = [ "style_traits 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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -820,7 +820,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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -982,7 +982,7 @@ dependencies = [ "time 0.1.34 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -999,7 +999,7 @@ dependencies = [ "script_traits 0.0.1", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -1163,7 +1163,7 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", ] @@ -1188,9 +1188,9 @@ dependencies = [ "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "threadpool 1.0.0 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (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)", + "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1222,7 +1222,7 @@ dependencies = [ "plugins 0.0.1", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "websocket 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1383,7 +1383,7 @@ name = "plugins" version = "0.0.1" dependencies = [ "tenacious 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1587,9 +1587,9 @@ 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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (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)", + "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.1 (git+https://github.com/Ygg01/xml5ever)", @@ -1617,7 +1617,7 @@ dependencies = [ "serde_macros 0.7.0 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1704,7 +1704,7 @@ dependencies = [ "script 0.0.1", "script_traits 0.0.1", "style 0.0.1", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "webrender 0.1.0 (git+https://github.com/servo/webrender)", "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)", @@ -1868,7 +1868,7 @@ dependencies = [ "string_cache 0.2.11 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1888,7 +1888,7 @@ dependencies = [ "selectors 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1995,7 +1995,7 @@ dependencies = [ [[package]] name = "url" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2006,7 +2006,7 @@ dependencies = [ "serde 0.7.0 (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)", + "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2056,16 +2056,7 @@ dependencies = [ "serde_macros 0.7.0 (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.11 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "uuid" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand 0.3.14 (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.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2183,7 +2174,7 @@ dependencies = [ "rand 0.3.14 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/servo/python/tidy.py b/servo/python/tidy.py index 8af8f31a4466..aea25c23107c 100644 --- a/servo/python/tidy.py +++ b/servo/python/tidy.py @@ -220,7 +220,7 @@ def check_lock(file_name, contents): raise StopIteration # package names to be neglected (as named by cargo) - exceptions = ["bitflags", "xml-rs", "byteorder", "uuid"] + exceptions = ["bitflags", "xml-rs", "byteorder"] import toml content = toml.loads(contents)