From 903a608c6aa19343bbf5487ae6144fe844184f46 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Fri, 24 Jul 2015 21:27:10 +0200 Subject: [PATCH 1/9] Upgrade to rustc 1.3.0-dev (e4e93196e 2015-07-14) --- components/servo/Cargo.lock | 16 ++++++++-------- ports/cef/Cargo.lock | 14 +++++++------- ports/gonk/Cargo.lock | 14 +++++++------- rust-snapshot-hash | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 90d29e2e9e8..b032dd45ff1 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -582,7 +582,7 @@ dependencies = [ "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -727,7 +727,7 @@ dependencies = [ "serde_macros 0.4.1 (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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "unicode-bidi 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1155,7 +1155,7 @@ dependencies = [ "serde 0.4.3 (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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1203,7 +1203,7 @@ dependencies = [ "quicksort 1.0.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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1290,13 +1290,13 @@ dependencies = [ "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_plugin" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1329,7 +1329,7 @@ dependencies = [ "serde_macros 0.4.1 (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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1342,7 +1342,7 @@ dependencies = [ "euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index eb55c30ac09..ba335d8e7c6 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -574,7 +574,7 @@ dependencies = [ "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -719,7 +719,7 @@ dependencies = [ "serde_macros 0.4.1 (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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "unicode-bidi 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1134,7 +1134,7 @@ dependencies = [ "serde 0.4.3 (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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1174,7 +1174,7 @@ dependencies = [ "quicksort 1.0.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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1287,13 +1287,13 @@ dependencies = [ "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_plugin" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1326,7 +1326,7 @@ dependencies = [ "serde_macros 0.4.1 (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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index d625915614e..7ec75154726 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -508,7 +508,7 @@ dependencies = [ "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -653,7 +653,7 @@ dependencies = [ "serde_macros 0.4.1 (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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "unicode-bidi 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1042,7 +1042,7 @@ dependencies = [ "serde 0.4.3 (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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1082,7 +1082,7 @@ dependencies = [ "quicksort 1.0.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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1185,13 +1185,13 @@ dependencies = [ "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_plugin" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1224,7 +1224,7 @@ dependencies = [ "serde_macros 0.4.1 (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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] diff --git a/rust-snapshot-hash b/rust-snapshot-hash index c4507561da4..cb99cade858 100644 --- a/rust-snapshot-hash +++ b/rust-snapshot-hash @@ -1 +1 @@ -fddfd089b75379f1d25f81541572d69a93f95c4f/rustc-1.3.0-dev +e4e93196e16030ebf7a20c473849534235d676f8/rustc-1.3.0-dev From a3c0366bd62bc4ac9a52b3e45bf81ba5fea4ed1a Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Fri, 24 Jul 2015 22:16:35 +0200 Subject: [PATCH 2/9] Fix deprecation warnings --- components/profile/lib.rs | 2 +- components/profile/mem.rs | 11 ++++++----- components/script/dom/document.rs | 2 +- components/script/dom/htmloptionelement.rs | 2 +- components/script/script_task.rs | 2 +- components/util/lib.rs | 2 +- components/util/opts.rs | 9 ++++----- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/components/profile/lib.rs b/components/profile/lib.rs index a874ed233bb..08971cb3e0f 100644 --- a/components/profile/lib.rs +++ b/components/profile/lib.rs @@ -5,7 +5,7 @@ #![feature(box_syntax)] #![feature(iter_arith)] #![cfg_attr(target_os="linux", feature(page_size))] -#![feature(slice_extras)] +#![feature(slice_splits)] #[macro_use] extern crate log; diff --git a/components/profile/mem.rs b/components/profile/mem.rs index 00a5c51f14b..ff9a19ecc36 100644 --- a/components/profile/mem.rs +++ b/components/profile/mem.rs @@ -249,14 +249,15 @@ impl ReportsForest { // Insert the path and size into the forest, adding any trees and nodes as necessary. fn insert(&mut self, path: &[String], size: usize) { + let (head, tail) = path.split_first().unwrap(); // Get the right tree, creating it if necessary. - if !self.trees.contains_key(&path[0]) { - self.trees.insert(path[0].clone(), ReportsTree::new(path[0].clone())); + if !self.trees.contains_key(head) { + self.trees.insert(head.clone(), ReportsTree::new(head.clone())); } - let t = self.trees.get_mut(&path[0]).unwrap(); + let t = self.trees.get_mut(head).unwrap(); - // Use tail() because the 0th path segment was used to find the right tree in the forest. - t.insert(path.tail(), size); + // Use tail because the 0th path segment was used to find the right tree in the forest. + t.insert(tail, size); } fn print(&mut self) { diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index d074dca0d4e..bd9e0fcfb92 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -1432,7 +1432,7 @@ impl<'a> DocumentMethods for &'a Document { Some(ref title) => { // Steps 3-4. let value = Node::collect_text_contents(title.r().children()); - split_html_space_chars(&value).collect::>().connect(" ") + split_html_space_chars(&value).collect::>().join(" ") }, } } diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs index b675f30ac03..28b7f0651ae 100644 --- a/components/script/dom/htmloptionelement.rs +++ b/components/script/dom/htmloptionelement.rs @@ -88,7 +88,7 @@ impl<'a> HTMLOptionElementMethods for &'a HTMLOptionElement { let mut content = String::new(); collect_text(&node, &mut content); let v: Vec<&str> = split_html_space_chars(&content).collect(); - v.connect(" ") + v.join(" ") } // https://www.whatwg.org/html/#dom-option-text diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 480514b36b2..f48f7a53b3a 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -1060,7 +1060,7 @@ impl ScriptTask { for it_page in self.root_page().iter() { urls.push(it_page.document().url().serialize()); } - let path_seg = format!("url({})", urls.connect(", ")); + let path_seg = format!("url({})", urls.join(", ")); let reports = ScriptTask::get_reports(self.get_cx(), path_seg); reports_chan.send(reports); } diff --git a/components/util/lib.rs b/components/util/lib.rs index 4e7759795c9..b108c516acc 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -15,7 +15,7 @@ #![feature(path_ext)] #![feature(plugin)] #![feature(rustc_private)] -#![feature(slice_extras)] +#![feature(slice_splits)] #![feature(step_by)] #![feature(step_trait)] #![feature(zero_one)] diff --git a/components/util/opts.rs b/components/util/opts.rs index 6787c9e7492..c8f65c97e54 100644 --- a/components/util/opts.rs +++ b/components/util/opts.rs @@ -267,8 +267,7 @@ pub fn default_opts() -> Opts { } pub fn from_cmdline_args(args: &[String]) { - let app_name = args[0].to_string(); - let args = args.tail(); + let (app_name, args) = args.split_first().unwrap(); let opts = vec!( getopts::optflag("c", "cpu", "CPU painting (default)"), @@ -305,7 +304,7 @@ pub fn from_cmdline_args(args: &[String]) { }; if opt_match.opt_present("h") || opt_match.opt_present("help") { - print_usage(&app_name, &opts); + print_usage(app_name, &opts); process::exit(0); }; @@ -318,11 +317,11 @@ pub fn from_cmdline_args(args: &[String]) { debug_options.insert(split.clone()); } if debug_options.contains(&"help") { - print_debug_usage(&app_name) + print_debug_usage(app_name) } let url = if opt_match.free.is_empty() { - print_usage(&app_name, &opts); + print_usage(app_name, &opts); args_fail("servo asks that you provide a URL") } else { let ref url = opt_match.free[0]; From 930921b0c39c860351eb8874a4939b6cec93cb41 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 30 Jul 2015 16:58:26 +0200 Subject: [PATCH 3/9] Upgrade to rustc 1.3.0-dev (87055a68c 2015-07-30) --- components/plugins/lints/str_to_string.rs | 2 +- .../plugins/lints/unrooted_must_root.rs | 6 +- components/plugins/utils.rs | 2 +- components/servo/Cargo.lock | 81 +++++++++++++------ ports/cef/Cargo.lock | 77 ++++++++++++------ ports/gonk/Cargo.lock | 77 ++++++++++++------ rust-snapshot-hash | 2 +- 7 files changed, 170 insertions(+), 77 deletions(-) diff --git a/components/plugins/lints/str_to_string.rs b/components/plugins/lints/str_to_string.rs index e58ff4e93ac..03a6b4f3a3e 100644 --- a/components/plugins/lints/str_to_string.rs +++ b/components/plugins/lints/str_to_string.rs @@ -22,7 +22,7 @@ impl LintPass for StrToStringPass { fn check_expr(&mut self, cx: &Context, expr: &ast::Expr) { match expr.node { ast::ExprMethodCall(ref method, _, ref args) - if method.node.as_str() == "to_string" + if method.node.name.as_str() == "to_string" && is_str(cx, &*args[0]) => { cx.span_lint(STR_TO_STRING, expr.span, "str.to_owned() is more efficient than str.to_string(), please use it instead"); diff --git a/components/plugins/lints/unrooted_must_root.rs b/components/plugins/lints/unrooted_must_root.rs index d51fe19871e..3d34c28db46 100644 --- a/components/plugins/lints/unrooted_must_root.rs +++ b/components/plugins/lints/unrooted_must_root.rs @@ -121,9 +121,9 @@ impl LintPass for UnrootedPass { block: &ast::Block, _span: codemap::Span, id: ast::NodeId) { match kind { visit::FkItemFn(i, _, _, _, _, _) | - visit::FkMethod(i, _, _) if i.as_str() == "new" - || i.as_str() == "new_inherited" - || i.as_str() == "new_initialized" => { + visit::FkMethod(i, _, _) if i.name.as_str() == "new" + || i.name.as_str() == "new_inherited" + || i.name.as_str() == "new_initialized" => { self.in_new_function = true; return; }, diff --git a/components/plugins/utils.rs b/components/plugins/utils.rs index 9cd843ae5a7..573eca63f6e 100644 --- a/components/plugins/utils.rs +++ b/components/plugins/utils.rs @@ -22,7 +22,7 @@ pub fn match_ty_unwrap<'a>(ty: &'a Ty, segments: &[&str]) -> Option<&'a [P]> // I could muck around with the maps and find the full path // however the more efficient way is to simply reverse the iterators and zip them // which will compare them in reverse until one of them runs out of segments - if seg.iter().rev().zip(segments.iter().rev()).all(|(a,b)| a.identifier.as_str() == *b) { + if seg.iter().rev().zip(segments.iter().rev()).all(|(a,b)| a.identifier.name.as_str() == *b) { match seg.last() { Some(&PathSegment {parameters: AngleBracketedParameters(ref a), ..}) => { Some(&a.types) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index b032dd45ff1..f9f7cac3336 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -49,7 +49,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "aster" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -234,6 +234,14 @@ name = "debug-builders" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "debug_unreachable" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unreachable 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "devtools" version = "0.0.1" @@ -449,7 +457,7 @@ dependencies = [ "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -581,8 +589,8 @@ dependencies = [ "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -726,8 +734,8 @@ dependencies = [ "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "unicode-bidi 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -980,6 +988,15 @@ dependencies = [ "phf_shared 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "phf_codegen" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "phf_generator 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "phf_generator" version = "0.7.3" @@ -1071,7 +1088,7 @@ name = "quasi_codegen" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1154,8 +1171,8 @@ dependencies = [ "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.4.3 (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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1202,8 +1219,8 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quicksort 1.0.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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1219,7 +1236,7 @@ name = "serde_codegen" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "quasi 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "quasi_macros 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1282,32 +1299,33 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_plugin" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_shared" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "debug_unreachable 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "style" @@ -1328,8 +1346,8 @@ dependencies = [ "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1341,8 +1359,8 @@ dependencies = [ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1410,6 +1428,14 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "unreachable" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "void 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "url" version = "0.2.36" @@ -1471,6 +1497,11 @@ dependencies = [ "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "void" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "webdriver" version = "0.2.0" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index ba335d8e7c6..f040ba33a6d 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -48,7 +48,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "aster" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -233,6 +233,14 @@ name = "debug-builders" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "debug_unreachable" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unreachable 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "devtools" version = "0.0.1" @@ -448,7 +456,7 @@ dependencies = [ "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -573,8 +581,8 @@ dependencies = [ "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -718,8 +726,8 @@ dependencies = [ "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "unicode-bidi 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -959,6 +967,15 @@ dependencies = [ "phf_shared 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "phf_codegen" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "phf_generator 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "phf_generator" version = "0.7.3" @@ -1050,7 +1067,7 @@ name = "quasi_codegen" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1133,8 +1150,8 @@ dependencies = [ "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.4.3 (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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1173,8 +1190,8 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quicksort 1.0.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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1190,7 +1207,7 @@ name = "serde_codegen" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "quasi 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "quasi_macros 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1279,32 +1296,33 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_plugin" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_shared" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "debug_unreachable 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "style" @@ -1325,8 +1343,8 @@ dependencies = [ "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1393,6 +1411,14 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "unreachable" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "void 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "url" version = "0.2.36" @@ -1444,6 +1470,11 @@ dependencies = [ "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "void" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "webdriver" version = "0.2.0" diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 7ec75154726..edb65650242 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -35,7 +35,7 @@ dependencies = [ [[package]] name = "aster" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -210,6 +210,14 @@ name = "debug-builders" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "debug_unreachable" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unreachable 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "devtools" version = "0.0.1" @@ -427,7 +435,7 @@ dependencies = [ "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -507,8 +515,8 @@ dependencies = [ "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -652,8 +660,8 @@ dependencies = [ "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "unicode-bidi 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -867,6 +875,15 @@ dependencies = [ "phf_shared 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "phf_codegen" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "phf_generator 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "phf_generator" version = "0.7.3" @@ -958,7 +975,7 @@ name = "quasi_codegen" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1041,8 +1058,8 @@ dependencies = [ "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.4.3 (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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1081,8 +1098,8 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quicksort 1.0.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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1098,7 +1115,7 @@ name = "serde_codegen" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "quasi 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "quasi_macros 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1177,32 +1194,33 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_plugin" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_shared" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "debug_unreachable 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "style" @@ -1223,8 +1241,8 @@ dependencies = [ "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (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.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1291,6 +1309,14 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "unreachable" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "void 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "url" version = "0.2.36" @@ -1333,6 +1359,11 @@ dependencies = [ "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "void" +version = "0.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "webdriver" version = "0.2.0" diff --git a/rust-snapshot-hash b/rust-snapshot-hash index cb99cade858..8f8341f6a47 100644 --- a/rust-snapshot-hash +++ b/rust-snapshot-hash @@ -1 +1 @@ -e4e93196e16030ebf7a20c473849534235d676f8/rustc-1.3.0-dev +87055a68c3194db212456f99ece080728a5fc2f8/rustc-1.3.0-dev From 47b07ae2e4c93694978d529b3ce147681523ade1 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 30 Jul 2015 17:16:30 +0200 Subject: [PATCH 4/9] Enable unstable feature in string-cache. See https://github.com/servo/string-cache/pull/95 --- components/script/Cargo.toml | 2 +- components/servo/Cargo.lock | 1 + ports/cef/Cargo.lock | 1 + ports/gonk/Cargo.lock | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index cdb925ff5eb..2b44bbd8465 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -80,7 +80,7 @@ websocket = "0.12" uuid = "0.1.16" smallvec = "0.1" html5ever = "0.2" -string_cache = "0.1" +string_cache = { version = "0.1.9", features = ["unstable"] } string_cache_plugin = "0.1" euclid = "0.1" tendril = "0.1.1" diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index f9f7cac3336..c7af2a1ca88 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -1304,6 +1304,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index f040ba33a6d..ca959f7b408 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -1301,6 +1301,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index edb65650242..7af5c61412f 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -1199,6 +1199,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] From f10851e788e9559e579c3673f87569c695a62dc5 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 30 Jul 2015 17:30:53 +0200 Subject: [PATCH 5/9] Update heap size tests for Vec allocation strategy change. --- tests/unit/util/mem.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/unit/util/mem.rs b/tests/unit/util/mem.rs index ff25ded0b31..c281d54c0c3 100644 --- a/tests/unit/util/mem.rs +++ b/tests/unit/util/mem.rs @@ -64,9 +64,12 @@ fn test_heap_size() { assert_eq!(x.heap_size_of_children(), 8); // An ascii string with 16 chars is 16 bytes in UTF-8. + assert_eq!(String::from("0123456789abcdef").heap_size_of_children(), 16); + + // … but RawVec::reserve gives twice the requested capacity. let mut x = String::new(); x.push_str("0123456789abcdef"); - assert_eq!(x.heap_size_of_children(), 16); + assert_eq!(x.heap_size_of_children(), 32); // Not on the heap. let x: Option = None; From 85aa1658cc2e1b8bec9e8a67633c7d7bcd1364d2 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 30 Jul 2015 17:31:50 +0200 Subject: [PATCH 6/9] Have our copy of the now deprecated `std::env::page_size` --- components/profile/lib.rs | 1 - components/profile/mem.rs | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/components/profile/lib.rs b/components/profile/lib.rs index 08971cb3e0f..ed54b593adb 100644 --- a/components/profile/lib.rs +++ b/components/profile/lib.rs @@ -4,7 +4,6 @@ #![feature(box_syntax)] #![feature(iter_arith)] -#![cfg_attr(target_os="linux", feature(page_size))] #![feature(slice_splits)] #[macro_use] extern crate log; diff --git a/components/profile/mem.rs b/components/profile/mem.rs index ff9a19ecc36..34254e83bbd 100644 --- a/components/profile/mem.rs +++ b/components/profile/mem.rs @@ -436,6 +436,13 @@ mod system_reporter { ($e:expr) => (match $e { Some(e) => e, None => return None }) ); + #[cfg(target_os="linux")] + fn page_size() -> usize { + unsafe { + ::libc::sysconf(::libc::_SC_PAGESIZE) as usize + } + } + #[cfg(target_os="linux")] fn get_proc_self_statm_field(field: usize) -> Option { use std::fs::File; @@ -446,7 +453,7 @@ mod system_reporter { option_try!(f.read_to_string(&mut contents).ok()); let s = option_try!(contents.split_whitespace().nth(field)); let npages = option_try!(s.parse::().ok()); - Some(npages * ::std::env::page_size()) + Some(npages * page_size()) } #[cfg(target_os="linux")] From 6737be1fb14719b6ab2167f008b1c63051886f4a Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 30 Jul 2015 17:56:19 +0200 Subject: [PATCH 7/9] Remove usage of the deprecated OwnedAsciiExt --- components/script/dom/htmlbuttonelement.rs | 5 +++-- components/script/dom/htmlformelement.rs | 1 - components/script/dom/htmlinputelement.rs | 1 - components/script/dom/macros.rs | 5 +++-- components/script/lib.rs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs index 0ba1cb740e4..0b40b97c5aa 100644 --- a/components/script/dom/htmlbuttonelement.rs +++ b/components/script/dom/htmlbuttonelement.rs @@ -22,7 +22,7 @@ use dom::node::{DisabledStateHelpers, Node, NodeHelpers, NodeTypeId, document_fr use dom::validitystate::ValidityState; use dom::virtualmethods::VirtualMethods; -use std::ascii::OwnedAsciiExt; +use std::ascii::AsciiExt; use std::borrow::ToOwned; use util::str::DOMString; use std::cell::Cell; @@ -86,7 +86,8 @@ impl<'a> HTMLButtonElementMethods for &'a HTMLButtonElement { // https://html.spec.whatwg.org/multipage/#dom-button-type fn Type(self) -> DOMString { let elem = ElementCast::from_ref(self); - let ty = elem.get_string_attribute(&atom!("type")).into_ascii_lowercase(); + let mut ty = elem.get_string_attribute(&atom!("type")); + ty.make_ascii_lowercase(); // https://html.spec.whatwg.org/multipage/#attr-button-type match &*ty { "reset" | "button" | "menu" => ty, diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index bfa5792327a..e0a948bbedf 100644 --- a/components/script/dom/htmlformelement.rs +++ b/components/script/dom/htmlformelement.rs @@ -35,7 +35,6 @@ use hyper::mime; use msg::constellation_msg::LoadData; use util::str::DOMString; use script_task::{ScriptChan, ScriptMsg}; -use std::ascii::OwnedAsciiExt; use url::UrlParser; use url::form_urlencoded::serialize; use string_cache::Atom; diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index 2f3db69b43d..e41fb1571b8 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -38,7 +38,6 @@ use msg::constellation_msg::ConstellationChan; use util::str::DOMString; use string_cache::Atom; -use std::ascii::OwnedAsciiExt; use std::borrow::ToOwned; use std::cell::Cell; diff --git a/components/script/dom/macros.rs b/components/script/dom/macros.rs index 457989af969..6b19d3f99c0 100644 --- a/components/script/dom/macros.rs +++ b/components/script/dom/macros.rs @@ -104,9 +104,10 @@ macro_rules! make_enumerated_getter( use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; use std::borrow::ToOwned; + use std::ascii::AsciiExt; let element = ElementCast::from_ref(self); - let val = element.get_string_attribute(&Atom::from_slice($htmlname)) - .into_ascii_lowercase(); + let mut val = element.get_string_attribute(&Atom::from_slice($htmlname)); + val.make_ascii_lowercase(); // https://html.spec.whatwg.org/multipage/#attr-fs-method match &*val { $($choices)|+ => val, diff --git a/components/script/lib.rs b/components/script/lib.rs index 16f73c85afd..459eff4bd82 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -4,6 +4,7 @@ #![feature(append)] #![feature(arc_unique)] +#![feature(ascii)] #![feature(as_slice)] #![feature(as_unsafe_cell)] #![feature(borrow_state)] @@ -17,7 +18,6 @@ #![feature(hashmap_hasher)] #![feature(mpsc_select)] #![feature(nonzero)] -#![feature(owned_ascii_ext)] #![feature(plugin)] #![feature(rc_unique)] #![feature(slice_chars)] From 2b620419975b8a4e364af4eaac7bdff0fcb94e0e Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 30 Jul 2015 18:01:44 +0200 Subject: [PATCH 8/9] Remove usage of the deprecated `box () (expr)` syntax. --- components/compositing/pipeline.rs | 2 +- components/script/dom/bindings/utils.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/compositing/pipeline.rs b/components/compositing/pipeline.rs index a47bfc7b1b3..7f867309b5a 100644 --- a/components/compositing/pipeline.rs +++ b/components/compositing/pipeline.rs @@ -111,7 +111,7 @@ impl Pipeline { new_pipeline_id: id, subpage_id: subpage_id, load_data: load_data.clone(), - paint_chan: box() (paint_chan.clone()) as Box, + paint_chan: box paint_chan.clone() as Box, failure: failure, pipeline_port: mem::replace(&mut pipeline_port, None).unwrap(), layout_shutdown_chan: layout_shutdown_chan.clone(), diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs index d29cc4d0c77..b9a9ad3dbf3 100644 --- a/components/script/dom/bindings/utils.rs +++ b/components/script/dom/bindings/utils.rs @@ -381,8 +381,8 @@ pub type ProtoOrIfaceArray = [*mut JSObject; PrototypeList::ID::Count as usize]; /// Construct and cache the ProtoOrIfaceArray for the given global. /// Fails if the argument is not a DOM global. pub fn initialize_global(global: *mut JSObject) { - let proto_array: Box = box () - ([0 as *mut JSObject; PrototypeList::ID::Count as usize]); + let proto_array: Box = + box [0 as *mut JSObject; PrototypeList::ID::Count as usize]; unsafe { assert!(((*JS_GetClass(global)).flags & JSCLASS_DOM_GLOBAL) != 0); let box_ = Box::into_raw(proto_array); From bd3be999feb2f2d933526023ad5c082405d61160 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 30 Jul 2015 20:15:30 +0200 Subject: [PATCH 9/9] Pick up string-cache cross-compilation fixes. https://github.com/servo/string-cache/pull/102 --- components/servo/Cargo.lock | 26 +++++++++++++------------- ports/cef/Cargo.lock | 24 ++++++++++++------------ ports/gonk/Cargo.lock | 24 ++++++++++++------------ 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index c7af2a1ca88..8b62789ce97 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -236,7 +236,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "debug_unreachable" -version = "0.0.5" +version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unreachable 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -457,7 +457,7 @@ dependencies = [ "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -589,7 +589,7 @@ dependencies = [ "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", @@ -734,7 +734,7 @@ dependencies = [ "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (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.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "unicode-bidi 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1171,7 +1171,7 @@ dependencies = [ "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.4.3 (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.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1219,7 +1219,7 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quicksort 1.0.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.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1299,13 +1299,13 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1315,15 +1315,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_shared" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "debug_unreachable 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "debug_unreachable 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1347,7 +1347,7 @@ dependencies = [ "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (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.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1360,7 +1360,7 @@ dependencies = [ "cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index ca959f7b408..3e09aaa0a8b 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -235,7 +235,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "debug_unreachable" -version = "0.0.5" +version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unreachable 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -456,7 +456,7 @@ dependencies = [ "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -581,7 +581,7 @@ dependencies = [ "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", @@ -726,7 +726,7 @@ dependencies = [ "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (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.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "unicode-bidi 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1150,7 +1150,7 @@ dependencies = [ "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.4.3 (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.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1190,7 +1190,7 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quicksort 1.0.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.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1296,13 +1296,13 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1312,15 +1312,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_shared" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "debug_unreachable 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "debug_unreachable 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1344,7 +1344,7 @@ dependencies = [ "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (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.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 7af5c61412f..c613d64d648 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -212,7 +212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "debug_unreachable" -version = "0.0.5" +version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unreachable 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -435,7 +435,7 @@ dependencies = [ "serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -515,7 +515,7 @@ dependencies = [ "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", @@ -660,7 +660,7 @@ dependencies = [ "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (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.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "unicode-bidi 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1058,7 +1058,7 @@ dependencies = [ "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.4.3 (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.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1098,7 +1098,7 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quicksort 1.0.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.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1194,13 +1194,13 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1210,15 +1210,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_shared" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "debug_unreachable 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "debug_unreachable 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1242,7 +1242,7 @@ dependencies = [ "serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.4.1 (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.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1",