Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-18 21:34:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to rustc 1.6.0-nightly (1805bba39 2015-11-26)

Browse source
This commit is contained in:
Simon Sapin 2015-11-27 11:22:59 +01:00
parent a515fe320b
commit 8d7d132c93
7 changed files with 50 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/plugins/lints/unrooted_must_root.rs
View file

@ -5,7 +5,8 @@
use rustc::front::map as ast_map; use rustc::front::map as ast_map;
use rustc::lint::{LateContext, LintPass, LintArray, LateLintPass, LintContext}; use rustc::lint::{LateContext, LintPass, LintArray, LateLintPass, LintContext};
use rustc::middle::ty; 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::attr::AttrMetaMethods;
use syntax::{ast, codemap}; use syntax::{ast, codemap};
use utils::{match_def_path, in_derive_expn}; use utils::{match_def_path, in_derive_expn};

2
components/plugins/url_plugin.rs
View file

@ -16,7 +16,7 @@ use url::{Url, Host, RelativeSchemeData, SchemeData};
pub fn expand_url(cx: &mut ExtCtxt, sp: Span, tts: &[TokenTree]) pub fn expand_url(cx: &mut ExtCtxt, sp: Span, tts: &[TokenTree])
-> Box<MacResult + 'static> { -> Box<MacResult + 'static> {
let mut parser = parse::new_parser_from_tts(cx.parse_sess(), cx.cfg(), tts.to_vec()); 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 // Ensure a str literal was passed to the macro
let query = match parse_str_lit(&query_expr) { let query = match parse_str_lit(&query_expr) {

2
components/plugins/utils.rs
View file

@ -76,7 +76,7 @@ pub fn unsafe_context(map: &ast_map::Map, id: ast::NodeId) -> bool {
match map.find(map.get_parent(id)) { match map.find(map.get_parent(id)) {
Some(ast_map::NodeImplItem(itm)) => { Some(ast_map::NodeImplItem(itm)) => {
match itm.node { match itm.node {
hir::MethodImplItem(ref sig, _) => sig.unsafety == hir::Unsafety::Unsafe, hir::ImplItemKind::Method(ref sig, _) => sig.unsafety == hir::Unsafety::Unsafe,
_ => false _ => false
} }
}, },

30
components/servo/Cargo.lock generated
View file

@ -86,7 +86,7 @@ dependencies = [
[[package]] [[package]]
name = "aster" name = "aster"
version = "0.7.0" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -1435,7 +1435,7 @@ dependencies = [
name = "plugins" name = "plugins"
version = "0.0.1" version = "0.0.1"
dependencies = [ 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)", "url 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1490,23 +1490,23 @@ dependencies = [
[[package]] [[package]]
name = "quasi" name = "quasi"
version = "0.3.7" version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "quasi_codegen" name = "quasi_codegen"
version = "0.3.7" version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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]] [[package]]
name = "quasi_macros" name = "quasi_macros"
version = "0.3.7" version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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]] [[package]]
@ -1653,12 +1653,12 @@ dependencies = [
[[package]] [[package]]
name = "serde_codegen" name = "serde_codegen"
version = "0.6.3" version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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)",
"quasi 0.3.7 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", "quasi_macros 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1675,7 +1675,7 @@ name = "serde_macros"
version = "0.6.1" version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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]] [[package]]
@ -1699,7 +1699,7 @@ dependencies = [
[[package]] [[package]]
name = "simd" name = "simd"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huonw/simd#be4242121e081206d8769cc60a7d2fa8e23cdc68" source = "git+https://github.com/huonw/simd#c4403387adb9a25188ff00ddc82582c2e1017030"
[[package]] [[package]]
name = "skia" name = "skia"
@ -1841,8 +1841,8 @@ dependencies = [
[[package]] [[package]]
name = "tenacious" name = "tenacious"
version = "0.0.13" version = "0.0.14"
source = "git+https://github.com/Manishearth/rust-tenacious#44c943182fb93a1c4b2e6d0b2d8ebb35d8c07775" source = "git+https://github.com/Manishearth/rust-tenacious#7e1729efe79ac8427dac322bfc936dbdb1f36d10"
[[package]] [[package]]
name = "tendril" name = "tendril"

30
ports/cef/Cargo.lock generated
View file

@ -75,7 +75,7 @@ dependencies = [
[[package]] [[package]]
name = "aster" name = "aster"
version = "0.7.0" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -1351,7 +1351,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "plugins" name = "plugins"
version = "0.0.1" version = "0.0.1"
dependencies = [ 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)", "url 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1404,23 +1404,23 @@ dependencies = [
[[package]] [[package]]
name = "quasi" name = "quasi"
version = "0.3.7" version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "quasi_codegen" name = "quasi_codegen"
version = "0.3.7" version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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]] [[package]]
name = "quasi_macros" name = "quasi_macros"
version = "0.3.7" version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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]] [[package]]
@ -1558,12 +1558,12 @@ dependencies = [
[[package]] [[package]]
name = "serde_codegen" name = "serde_codegen"
version = "0.6.3" version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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)",
"quasi 0.3.7 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", "quasi_macros 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1580,7 +1580,7 @@ name = "serde_macros"
version = "0.6.1" version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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]] [[package]]
@ -1640,7 +1640,7 @@ dependencies = [
[[package]] [[package]]
name = "simd" name = "simd"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huonw/simd#be4242121e081206d8769cc60a7d2fa8e23cdc68" source = "git+https://github.com/huonw/simd#c4403387adb9a25188ff00ddc82582c2e1017030"
[[package]] [[package]]
name = "skia" name = "skia"
@ -1766,8 +1766,8 @@ dependencies = [
[[package]] [[package]]
name = "tenacious" name = "tenacious"
version = "0.0.13" version = "0.0.14"
source = "git+https://github.com/Manishearth/rust-tenacious#44c943182fb93a1c4b2e6d0b2d8ebb35d8c07775" source = "git+https://github.com/Manishearth/rust-tenacious#7e1729efe79ac8427dac322bfc936dbdb1f36d10"
[[package]] [[package]]
name = "tendril" name = "tendril"

30
ports/gonk/Cargo.lock generated
View file

@ -67,7 +67,7 @@ dependencies = [
[[package]] [[package]]
name = "aster" name = "aster"
version = "0.7.0" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -1331,7 +1331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "plugins" name = "plugins"
version = "0.0.1" version = "0.0.1"
dependencies = [ 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)", "url 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1384,23 +1384,23 @@ dependencies = [
[[package]] [[package]]
name = "quasi" name = "quasi"
version = "0.3.7" version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "quasi_codegen" name = "quasi_codegen"
version = "0.3.7" version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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]] [[package]]
name = "quasi_macros" name = "quasi_macros"
version = "0.3.7" version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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]] [[package]]
@ -1538,12 +1538,12 @@ dependencies = [
[[package]] [[package]]
name = "serde_codegen" name = "serde_codegen"
version = "0.6.3" version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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)",
"quasi 0.3.7 (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.7 (registry+https://github.com/rust-lang/crates.io-index)", "quasi_macros 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1560,7 +1560,7 @@ name = "serde_macros"
version = "0.6.1" version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ 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]] [[package]]
@ -1618,7 +1618,7 @@ dependencies = [
[[package]] [[package]]
name = "simd" name = "simd"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/huonw/simd#be4242121e081206d8769cc60a7d2fa8e23cdc68" source = "git+https://github.com/huonw/simd#c4403387adb9a25188ff00ddc82582c2e1017030"
[[package]] [[package]]
name = "skia" name = "skia"
@ -1744,8 +1744,8 @@ dependencies = [
[[package]] [[package]]
name = "tenacious" name = "tenacious"
version = "0.0.13" version = "0.0.14"
source = "git+https://github.com/Manishearth/rust-tenacious#44c943182fb93a1c4b2e6d0b2d8ebb35d8c07775" source = "git+https://github.com/Manishearth/rust-tenacious#7e1729efe79ac8427dac322bfc936dbdb1f36d10"
[[package]] [[package]]
name = "tendril" name = "tendril"

2
rust-snapshot-hash
View file

@ -1 +1 @@
2015-11-13 2015-11-26