servo: Merge #16203 - Upgrade to rustc 1.18.0-nightly (474f7a91e 2017-03-31) (from servo:rustup); r=nox

Source-Repo: https://github.com/servo/servo
Source-Revision: e264be7dd7627965fd0a4b7f3e05457aed772a43

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 5102f5e5b9ccc99eae660d9ea2dffb5a80e3376c

servo/components/script_plugins/unrooted_must_root.rs

@@ -138,7 +138,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
             visit::FnKind::Closure(_) => return,
         };
 
-        if !in_derive_expn(cx, span) {
+        if !in_derive_expn(span) {
             let def_id = cx.tcx.hir.local_def_id(id);
             let ty = cx.tcx.item_type(def_id);
 

servo/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
+    }
 }

servo/rust-commit-hash

@@ -1 +1 @@
-cf69238b82661f5fcb6488e31ef27977f5d2cb81
+474f7a91eec8cba83b7eb7a578a7adb70614f877