From de01c5989173b5e4a1fe320a10d4bcfb4609ce99 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Fri, 31 Mar 2017 15:09:04 +0200
Subject: Upgrade to rustc 1.18.0-nightly (474f7a91e 2017-03-31)

---
 components/script_plugins/utils.rs | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'components/script_plugins/utils.rs')

diff --git a/components/script_plugins/utils.rs b/components/script_plugins/utils.rs
index 3c768a51ae2..4f6fce2d0ed 100644
--- a/components/script_plugins/utils.rs
+++ b/components/script_plugins/utils.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use rustc::hir::def_id::DefId;
-use rustc::lint::{LateContext, LintContext};
+use rustc::lint::LateContext;
 use syntax::codemap::{ExpnFormat, Span};
 
 /// check if a DefId's path matches the given absolute type path
@@ -28,15 +28,14 @@ pub fn match_def_path(cx: &LateContext, def_id: DefId, path: &[&str]) -> bool {
          .all(|(nm, p)| &*nm.as_interned_str() == *p)
 }
 
-pub fn in_derive_expn(cx: &LateContext, span: Span) -> bool {
-    cx.sess().codemap().with_expn_info(span.expn_id,
-            |info| {
-                if let Some(i) = info {
-                    if let ExpnFormat::MacroAttribute(n) = i.callee.format {
-                        if n.as_str().contains("derive") {
-                            true
-                        } else { false }
-                    } else { false }
-                } else { false }
-            })
+pub fn in_derive_expn(span: Span) -> bool {
+    if let Some(i) = span.ctxt.outer().expn_info() {
+        if let ExpnFormat::MacroAttribute(n) = i.callee.format {
+            n.as_str().contains("derive")
+        } else {
+            false
+        }
+    } else {
+        false
+    }
 }
-- 
cgit v1.2.3