about summary refs log tree commit diff
path: root/src/librustc_interface
diff options
context:
space:
mode:
authorljedrz <ljedrz@gmail.com>2019-02-27 17:35:24 +0100
committerljedrz <ljedrz@gmail.com>2019-03-02 07:48:52 +0100
commit77fa041fc1ca58b2ccbdb600f39aa92da1276970 (patch)
tree8f691623d821f4ab7ab2a0b6674dfbf7a09a09cd /src/librustc_interface
parent3c25193f3ff60faff504a24749761970a72ccdc6 (diff)
downloadrust-77fa041fc1ca58b2ccbdb600f39aa92da1276970.tar.gz
rust-77fa041fc1ca58b2ccbdb600f39aa92da1276970.zip
hir: remove NodeId from Item
Diffstat (limited to 'src/librustc_interface')
-rw-r--r--src/librustc_interface/proc_macro_decls.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/librustc_interface/proc_macro_decls.rs b/src/librustc_interface/proc_macro_decls.rs
index 093d15b7e3c..8ed03efd1a7 100644
--- a/src/librustc_interface/proc_macro_decls.rs
+++ b/src/librustc_interface/proc_macro_decls.rs
@@ -3,7 +3,6 @@ use rustc::hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
 use rustc::hir;
 use rustc::ty::TyCtxt;
 use rustc::ty::query::Providers;
-use syntax::ast;
 use syntax::attr;
 
 pub fn find<'tcx>(tcx: TyCtxt<'_, 'tcx, 'tcx>) -> Option<DefId> {
@@ -19,17 +18,17 @@ fn proc_macro_decls_static<'tcx>(
     let mut finder = Finder { decls: None };
     tcx.hir().krate().visit_all_item_likes(&mut finder);
 
-    finder.decls.map(|id| tcx.hir().local_def_id(id))
+    finder.decls.map(|id| tcx.hir().local_def_id_from_hir_id(id))
 }
 
 struct Finder {
-    decls: Option<ast::NodeId>,
+    decls: Option<hir::HirId>,
 }
 
 impl<'v> ItemLikeVisitor<'v> for Finder {
     fn visit_item(&mut self, item: &hir::Item) {
         if attr::contains_name(&item.attrs, "rustc_proc_macro_decls") {
-            self.decls = Some(item.id);
+            self.decls = Some(item.hir_id);
         }
     }