Skip to content
Permalink
Browse files

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

  • Loading branch information...
SimonSapin committed Aug 24, 2019
1 parent 6ff2524 commit 714a5b4248daee3a96a70734243bbd58aced4e27
Showing with 4 additions and 13 deletions.
  1. +1 −6 components/script_plugins/lib.rs
  2. +2 −6 components/script_plugins/utils.rs
  3. +1 −1 rust-toolchain
@@ -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;

@@ -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
}
@@ -1 +1 @@
nightly-2019-08-16
nightly-2019-08-24

0 comments on commit 714a5b4

Please sign in to comment.
You can’t perform that action at this time.