diff --git a/components/plugins/lints/unrooted_must_root.rs b/components/plugins/lints/unrooted_must_root.rs index 7f4eacdbd62..2c8a09e2a31 100644 --- a/components/plugins/lints/unrooted_must_root.rs +++ b/components/plugins/lints/unrooted_must_root.rs @@ -5,7 +5,8 @@ use rustc::front::map as ast_map; use rustc::lint::{LateContext, LintPass, LintArray, LateLintPass, LintContext}; use rustc::middle::ty; -use rustc_front::{hir, visit}; +use rustc_front::hir; +use rustc_front::intravisit as visit; use syntax::attr::AttrMetaMethods; use syntax::{ast, codemap}; use utils::{match_def_path, in_derive_expn}; diff --git a/components/plugins/url_plugin.rs b/components/plugins/url_plugin.rs index e757916c4f7..63f6ae777d1 100644 --- a/components/plugins/url_plugin.rs +++ b/components/plugins/url_plugin.rs @@ -16,7 +16,7 @@ use url::{Url, Host, RelativeSchemeData, SchemeData}; pub fn expand_url(cx: &mut ExtCtxt, sp: Span, tts: &[TokenTree]) -> Box { let mut parser = parse::new_parser_from_tts(cx.parse_sess(), cx.cfg(), tts.to_vec()); - let query_expr = cx.expander().fold_expr(parser.parse_expr_nopanic().unwrap()); + let query_expr = cx.expander().fold_expr(parser.parse_expr().unwrap()); // Ensure a str literal was passed to the macro let query = match parse_str_lit(&query_expr) { diff --git a/components/plugins/utils.rs b/components/plugins/utils.rs index d9816c7a921..8c97842bc15 100644 --- a/components/plugins/utils.rs +++ b/components/plugins/utils.rs @@ -76,7 +76,7 @@ pub fn unsafe_context(map: &ast_map::Map, id: ast::NodeId) -> bool { match map.find(map.get_parent(id)) { Some(ast_map::NodeImplItem(itm)) => { match itm.node { - hir::MethodImplItem(ref sig, _) => sig.unsafety == hir::Unsafety::Unsafe, + hir::ImplItemKind::Method(ref sig, _) => sig.unsafety == hir::Unsafety::Unsafe, _ => false } }, diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index e5f784abea8..4c1841e85b8 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -86,7 +86,7 @@ dependencies = [ [[package]] name = "aster" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1435,7 +1435,7 @@ dependencies = [ name = "plugins" version = "0.0.1" dependencies = [ - "tenacious 0.0.13 (git+https://github.com/Manishearth/rust-tenacious)", + "tenacious 0.0.14 (git+https://github.com/Manishearth/rust-tenacious)", "url 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1490,23 +1490,23 @@ dependencies = [ [[package]] name = "quasi" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "quasi_codegen" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "quasi_macros" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "quasi_codegen 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_codegen 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1653,12 +1653,12 @@ dependencies = [ [[package]] name = "serde_codegen" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_macros 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_macros 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1675,7 +1675,7 @@ name = "serde_macros" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_codegen 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_codegen 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1699,7 +1699,7 @@ dependencies = [ [[package]] name = "simd" version = "0.1.0" -source = "git+https://github.com/huonw/simd#be4242121e081206d8769cc60a7d2fa8e23cdc68" +source = "git+https://github.com/huonw/simd#c4403387adb9a25188ff00ddc82582c2e1017030" [[package]] name = "skia" @@ -1841,8 +1841,8 @@ dependencies = [ [[package]] name = "tenacious" -version = "0.0.13" -source = "git+https://github.com/Manishearth/rust-tenacious#44c943182fb93a1c4b2e6d0b2d8ebb35d8c07775" +version = "0.0.14" +source = "git+https://github.com/Manishearth/rust-tenacious#7e1729efe79ac8427dac322bfc936dbdb1f36d10" [[package]] name = "tendril" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 8843e937ec4..d280d8f7a3c 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "aster" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1351,7 +1351,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "plugins" version = "0.0.1" dependencies = [ - "tenacious 0.0.13 (git+https://github.com/Manishearth/rust-tenacious)", + "tenacious 0.0.14 (git+https://github.com/Manishearth/rust-tenacious)", "url 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1404,23 +1404,23 @@ dependencies = [ [[package]] name = "quasi" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "quasi_codegen" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "quasi_macros" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "quasi_codegen 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_codegen 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1558,12 +1558,12 @@ dependencies = [ [[package]] name = "serde_codegen" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_macros 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_macros 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1580,7 +1580,7 @@ name = "serde_macros" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_codegen 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_codegen 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1640,7 +1640,7 @@ dependencies = [ [[package]] name = "simd" version = "0.1.0" -source = "git+https://github.com/huonw/simd#be4242121e081206d8769cc60a7d2fa8e23cdc68" +source = "git+https://github.com/huonw/simd#c4403387adb9a25188ff00ddc82582c2e1017030" [[package]] name = "skia" @@ -1766,8 +1766,8 @@ dependencies = [ [[package]] name = "tenacious" -version = "0.0.13" -source = "git+https://github.com/Manishearth/rust-tenacious#44c943182fb93a1c4b2e6d0b2d8ebb35d8c07775" +version = "0.0.14" +source = "git+https://github.com/Manishearth/rust-tenacious#7e1729efe79ac8427dac322bfc936dbdb1f36d10" [[package]] name = "tendril" diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 7b35df524a1..570a8fd81ff 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "aster" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1331,7 +1331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "plugins" version = "0.0.1" dependencies = [ - "tenacious 0.0.13 (git+https://github.com/Manishearth/rust-tenacious)", + "tenacious 0.0.14 (git+https://github.com/Manishearth/rust-tenacious)", "url 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1384,23 +1384,23 @@ dependencies = [ [[package]] name = "quasi" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "quasi_codegen" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "quasi_macros" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "quasi_codegen 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_codegen 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1538,12 +1538,12 @@ dependencies = [ [[package]] name = "serde_codegen" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_macros 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_macros 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1560,7 +1560,7 @@ name = "serde_macros" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_codegen 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_codegen 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1618,7 +1618,7 @@ dependencies = [ [[package]] name = "simd" version = "0.1.0" -source = "git+https://github.com/huonw/simd#be4242121e081206d8769cc60a7d2fa8e23cdc68" +source = "git+https://github.com/huonw/simd#c4403387adb9a25188ff00ddc82582c2e1017030" [[package]] name = "skia" @@ -1744,8 +1744,8 @@ dependencies = [ [[package]] name = "tenacious" -version = "0.0.13" -source = "git+https://github.com/Manishearth/rust-tenacious#44c943182fb93a1c4b2e6d0b2d8ebb35d8c07775" +version = "0.0.14" +source = "git+https://github.com/Manishearth/rust-tenacious#7e1729efe79ac8427dac322bfc936dbdb1f36d10" [[package]] name = "tendril" diff --git a/rust-snapshot-hash b/rust-snapshot-hash index 83ddb0ed279..34250de322f 100644 --- a/rust-snapshot-hash +++ b/rust-snapshot-hash @@ -1 +1 @@ -2015-11-13 +2015-11-26