Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to rustc 1.39.0-nightly (9eae1fc0e 2019-08-23)

Browse source
This commit is contained in:
Simon Sapin 2019-08-24 13:40:46 +02:00
parent 6ff2524781
commit 714a5b4248
3 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script_plugins/lib.rs
View file

@ -21,17 +21,12 @@
#[cfg(feature = "unrooted_must_root_lint")]
#[macro_use]
extern crate rustc;
// Work around TLS failure: https://github.com/rust-lang/rust/issues/62717#issuecomment-511876555
#[allow(unused)]
extern crate rustc_driver;
extern crate rustc_plugin;
extern crate syntax;
extern crate weedle;
use rustc_plugin::Registry;
use rustc_driver::plugin::Registry;
use syntax::feature_gate::AttributeType::Whitelisted;
use syntax::symbol::Symbol;

8
components/script_plugins/utils.rs
View file

@ -30,12 +30,8 @@ pub fn match_def_path(cx: &LateContext, def_id: DefId, path: &[Symbol]) -> bool
}
pub fn in_derive_expn(span: Span) -> bool {
if let Some(i) = span.ctxt().outer_expn().expn_info() {
if let ExpnKind::Macro(MacroKind::Attr, n) = i.kind {
n.as_str().contains("derive")
} else {
false
}
if let ExpnKind::Macro(MacroKind::Attr, n) = span.ctxt().outer_expn_data().kind {
n.as_str().contains("derive")
} else {
false
}

2
rust-toolchain
View file

@ -1 +1 @@
nightly-2019-08-16
nightly-2019-08-24