From 714a5b4248daee3a96a70734243bbd58aced4e27 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Sat, 24 Aug 2019 13:40:46 +0200
Subject: [PATCH] Upgrade to rustc 1.39.0-nightly (9eae1fc0e 2019-08-23)

---
 components/script_plugins/lib.rs   | 7 +------
 components/script_plugins/utils.rs | 8 ++------
 rust-toolchain                     | 2 +-
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/components/script_plugins/lib.rs b/components/script_plugins/lib.rs
index f17556f2eab..cdebd231092 100644
--- a/components/script_plugins/lib.rs
+++ b/components/script_plugins/lib.rs
@@ -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;
 
diff --git a/components/script_plugins/utils.rs b/components/script_plugins/utils.rs
index 686b104daf6..6815b7bb0a6 100644
--- a/components/script_plugins/utils.rs
+++ b/components/script_plugins/utils.rs
@@ -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
     }
diff --git a/rust-toolchain b/rust-toolchain
index 524b40da425..4d27f47df80 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2019-08-16
+nightly-2019-08-24