Rust upgrade to nightly 20151002

1 files changed, 2 insertions, 3 deletions

diff --git a/components/plugins/lints/inheritance_integrity.rs b/components/plugins/lints/inheritance_integrity.rs
index e1845b0a786..4f5770948aa 100644
--- a/components/plugins/lints/inheritance_integrity.rs
+++ b/components/plugins/lints/inheritance_integrity.rs
@@ -4,7 +4,6 @@
 
 use rustc::lint::{LateContext, LintPass, LintArray, Level, LateLintPass, LintContext};
 use rustc::middle::def;
-use rustc::middle::def_id::DefId;
 use rustc_front::hir;
 use syntax::ast;
 use utils::match_lang_ty;
@@ -25,11 +24,11 @@ impl LintPass for InheritancePass {
 }
 
 impl LateLintPass for InheritancePass {
-    fn check_struct_def(&mut self, cx: &LateContext, def: &hir::StructDef, _i: ast::Ident,
+    fn check_struct_def(&mut self, cx: &LateContext, def: &hir::StructDef, _n: ast::Name,
                         _gen: &hir::Generics, id: ast::NodeId) {
         // Lints are run post expansion, so it's fine to use
         // #[_dom_struct_marker] here without also checking for #[dom_struct]
-        if cx.tcx.has_attr(DefId::local(id), "_dom_struct_marker") {
+        if cx.tcx.has_attr(cx.tcx.map.local_def_id(id), "_dom_struct_marker") {
             // Find the reflector, if any
             let reflector_span = def.fields.iter().enumerate()
                                     .find(|&(ctr, f)| {