remove hir::map::get

ljedrz · ljedrz · commit a64456e48e78 · 2019-06-20T12:47:26.000+02:00
diff --git a/src/librustc/hir/map/mod.rs b/src/librustc/hir/map/mod.rs
@@ -561,20 +561,14 @@ impl<'hir> Map<'hir> {
     }
 
     /// Retrieves the `Node` corresponding to `id`, panicking if it cannot be found.
-    pub fn get(&self, id: NodeId) -> Node<'hir> {
-        let hir_id = self.node_to_hir_id(id);
-        self.get_by_hir_id(hir_id)
-    }
-
-    // FIXME(@ljedrz): replace the `NodeId` variant.
     pub fn get_by_hir_id(&self, id: HirId) -> Node<'hir> {
         // read recorded by `find`
         self.find_by_hir_id(id).unwrap_or_else(||
             bug!("couldn't find hir id {} in the HIR map", id))
     }
 
     pub fn get_if_local(&self, id: DefId) -> Option<Node<'hir>> {
-        self.as_local_node_id(id).map(|id| self.get(id)) // read recorded by `get`
+        self.as_local_hir_id(id).map(|id| self.get_by_hir_id(id)) // read recorded by `get`
     }
 
     pub fn get_generics(&self, id: DefId) -> Option<&'hir Generics> {
diff --git a/src/librustc_driver/pretty.rs b/src/librustc_driver/pretty.rs
@@ -830,7 +830,8 @@ pub fn print_after_hir_lowering<'tcx>(
                                                                          box out,
                                                                          annotation.pp_ann());
                     for node_id in uii.all_matching_node_ids(hir_map) {
-                        let node = hir_map.get(node_id);
+                        let hir_id = tcx.hir().node_to_hir_id(node_id);
+                        let node = hir_map.get_by_hir_id(hir_id);
                         pp_state.print_node(node)?;
                         pp_state.s.space()?;
                         let path = annotation.node_path(node_id)
@@ -847,7 +848,8 @@ pub fn print_after_hir_lowering<'tcx>(
                 s.call_with_pp_support_hir(tcx, move |_annotation, _krate| {
                     debug!("pretty printing source code {:?}", s);
                     for node_id in uii.all_matching_node_ids(tcx.hir()) {
-                        let node = tcx.hir().get(node_id);
+                        let hir_id = tcx.hir().node_to_hir_id(node_id);
+                        let node = tcx.hir().get_by_hir_id(hir_id);
                         write!(out, "{:#?}", node)?;
                     }
                     Ok(())
diff --git a/src/librustc_save_analysis/dump_visitor.rs b/src/librustc_save_analysis/dump_visitor.rs
@@ -233,7 +233,8 @@ impl<'l, 'tcx, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
     }
 
     fn lookup_def_id(&self, ref_id: NodeId) -> Option<DefId> {
-        match self.save_ctxt.get_path_res(ref_id) {
+        let hir_id = self.save_ctxt.tcx.hir().node_to_hir_id(ref_id);
+        match self.save_ctxt.get_path_res(hir_id) {
             Res::PrimTy(..) | Res::SelfTy(..) | Res::Err => None,
             def => Some(def.def_id()),
         }
@@ -886,7 +887,8 @@ impl<'l, 'tcx, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
                         return;
                     }
                 };
-                let variant = adt.variant_of_res(self.save_ctxt.get_path_res(p.id));
+                let hir_id = self.save_ctxt.tcx.hir().node_to_hir_id(p.id);
+                let variant = adt.variant_of_res(self.save_ctxt.get_path_res(hir_id));
 
                 for &Spanned { node: ref field, .. } in fields {
                     if let Some(index) = self.tcx.find_field_index(field.ident, variant) {
@@ -916,7 +918,8 @@ impl<'l, 'tcx, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> {
 
         // process collected paths
         for (id, ident, immut) in collector.collected_idents {
-            match self.save_ctxt.get_path_res(id) {
+            let hir_id = self.save_ctxt.tcx.hir().node_to_hir_id(id);
+            match self.save_ctxt.get_path_res(hir_id) {
                 Res::Local(hir_id) => {
                     let mut value = if immut == ast::Mutability::Immutable {
                         self.span.snippet(ident.span)
@@ -1540,8 +1543,7 @@ impl<'l, 'tcx, 'll, O: DumpOutput + 'll> Visitor<'l> for DumpVisitor<'l, 'tcx, '
                         return;
                     }
                 };
-                let node_id = self.save_ctxt.tcx.hir().hir_to_node_id(hir_expr.hir_id);
-                let res = self.save_ctxt.get_path_res(node_id);
+                let res = self.save_ctxt.get_path_res(hir_expr.hir_id);
                 self.process_struct_lit(ex, path, fields, adt.variant_of_res(res), base)
             }
             ast::ExprKind::MethodCall(ref seg, ref args) => self.process_method_call(ex, seg, args),
diff --git a/src/librustc_save_analysis/lib.rs b/src/librustc_save_analysis/lib.rs
@@ -606,8 +606,8 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
         }
     }
 
-    pub fn get_path_res(&self, id: NodeId) -> Res {
-        match self.tcx.hir().get(id) {
+    pub fn get_path_res(&self, hir_id: hir::HirId) -> Res {
+        match self.tcx.hir().get_by_hir_id(hir_id) {
             Node::TraitRef(tr) => tr.path.res,
 
             Node::Item(&hir::Item {
@@ -620,15 +620,14 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
             Node::PathSegment(seg) => {
                 match seg.res {
                     Some(res) if res != Res::Err => res,
-                    _ => self.get_path_res(self.tcx.hir().get_parent_node(id)),
+                    _ => self.get_path_res(self.tcx.hir().get_parent_node_by_hir_id(hir_id)),
                 }
             }
 
             Node::Expr(&hir::Expr {
                 node: hir::ExprKind::Struct(ref qpath, ..),
                 ..
             }) => {
-                let hir_id = self.tcx.hir().node_to_hir_id(id);
                 self.tables.qpath_res(qpath, hir_id)
             }
 
@@ -652,7 +651,6 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
                 node: hir::TyKind::Path(ref qpath),
                 ..
             }) => {
-                let hir_id = self.tcx.hir().node_to_hir_id(id);
                 self.tables.qpath_res(qpath, hir_id)
             }
 
@@ -697,7 +695,8 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
             return None;
         }
 
-        let res = self.get_path_res(id);
+        let hir_id = self.tcx.hir().node_to_hir_id(id);
+        let res = self.get_path_res(hir_id);
         let span = path_seg.ident.span;
         filter!(self.span_utils, span);
         let span = self.span_from_span(span);
@@ -869,7 +868,8 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
     }
 
     fn lookup_ref_id(&self, ref_id: NodeId) -> Option<DefId> {
-        match self.get_path_res(ref_id) {
+        let hir_id = self.tcx.hir().node_to_hir_id(ref_id);
+        match self.get_path_res(hir_id) {
             Res::PrimTy(_) | Res::SelfTy(..) | Res::Err => None,
             def => Some(def.def_id()),
         }
diff --git a/src/librustc_save_analysis/sig.rs b/src/librustc_save_analysis/sig.rs
@@ -273,7 +273,8 @@ impl Sig for ast::Ty {
                 };
 
                 let name = pprust::path_segment_to_string(path.segments.last().ok_or("Bad path")?);
-                let res = scx.get_path_res(id.ok_or("Missing id for Path")?);
+                let hir_id = id.map(|node_id| scx.tcx.hir().node_to_hir_id(node_id));
+                let res = scx.get_path_res(hir_id.ok_or("Missing id for Path")?);
                 let id = id_from_def_id(res.def_id());
                 if path.segments.len() - qself.position == 1 {
                     let start = offset + prefix.len();
@@ -576,7 +577,8 @@ impl Sig for ast::Item {
 
 impl Sig for ast::Path {
     fn make(&self, offset: usize, id: Option<NodeId>, scx: &SaveContext<'_, '_>) -> Result {
-        let res = scx.get_path_res(id.ok_or("Missing id for Path")?);
+        let hir_id = id.map(|node_id| scx.tcx.hir().node_to_hir_id(node_id));
+        let res = scx.get_path_res(hir_id.ok_or("Missing id for Path")?);
 
         let (name, start, end) = match res {
             Res::PrimTy(..) | Res::SelfTy(..) | Res::Err => {

Original file line number	Diff line number	Diff line change
`@@ -561,20 +561,14 @@ impl<'hir> Map<'hir> {`
`561`	`561`	`}`
`562`	`562`
`563`	`563`	/// Retrieves the `Node` corresponding to `id`, panicking if it cannot be found.
`564`		`- pub fn get(&self, id: NodeId) -> Node<'hir> {`
`565`		`- let hir_id = self.node_to_hir_id(id);`
`566`		`- self.get_by_hir_id(hir_id)`
`567`		`- }`
`568`		`-`
`569`		- // FIXME(@ljedrz): replace the `NodeId` variant.
`570`	`564`	`pub fn get_by_hir_id(&self, id: HirId) -> Node<'hir> {`
`571`	`565`	// read recorded by `find`
`572`	`566`	`self.find_by_hir_id(id).unwrap_or_else(\|\|`
`573`	`567`	`bug!("couldn't find hir id {} in the HIR map", id))`
`574`	`568`	`}`
`575`	`569`
`576`	`570`	`pub fn get_if_local(&self, id: DefId) -> Option<Node<'hir>> {`
`577`		- self.as_local_node_id(id).map(\|id\| self.get(id)) // read recorded by `get`
	`571`	+ self.as_local_hir_id(id).map(\|id\| self.get_by_hir_id(id)) // read recorded by `get`
`578`	`572`	`}`
`579`	`573`
`580`	`574`	`pub fn get_generics(&self, id: DefId) -> Option<&'hir Generics> {`
Original file line number	Diff line number	Diff line change
`@@ -606,8 +606,8 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {`
`606`	`606`	`}`
`607`	`607`	`}`
`608`	`608`
`609`		`- pub fn get_path_res(&self, id: NodeId) -> Res {`
`610`		`- match self.tcx.hir().get(id) {`
	`609`	`+ pub fn get_path_res(&self, hir_id: hir::HirId) -> Res {`
	`610`	`+ match self.tcx.hir().get_by_hir_id(hir_id) {`
`611`	`611`	`Node::TraitRef(tr) => tr.path.res,`
`612`	`612`
`613`	`613`	`Node::Item(&hir::Item {`
`@@ -620,15 +620,14 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {`
`620`	`620`	`Node::PathSegment(seg) => {`
`621`	`621`	`match seg.res {`
`622`	`622`	`Some(res) if res != Res::Err => res,`
`623`		`- _ => self.get_path_res(self.tcx.hir().get_parent_node(id)),`
	`623`	`+ _ => self.get_path_res(self.tcx.hir().get_parent_node_by_hir_id(hir_id)),`
`624`	`624`	`}`
`625`	`625`	`}`
`626`	`626`
`627`	`627`	`Node::Expr(&hir::Expr {`
`628`	`628`	`node: hir::ExprKind::Struct(ref qpath, ..),`
`629`	`629`	`..`
`630`	`630`	`}) => {`
`631`		`- let hir_id = self.tcx.hir().node_to_hir_id(id);`
`632`	`631`	`self.tables.qpath_res(qpath, hir_id)`
`633`	`632`	`}`
`634`	`633`
`@@ -652,7 +651,6 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {`
`652`	`651`	`node: hir::TyKind::Path(ref qpath),`
`653`	`652`	`..`
`654`	`653`	`}) => {`
`655`		`- let hir_id = self.tcx.hir().node_to_hir_id(id);`
`656`	`654`	`self.tables.qpath_res(qpath, hir_id)`
`657`	`655`	`}`
`658`	`656`
`@@ -697,7 +695,8 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {`
`697`	`695`	`return None;`
`698`	`696`	`}`
`699`	`697`
`700`		`- let res = self.get_path_res(id);`
	`698`	`+ let hir_id = self.tcx.hir().node_to_hir_id(id);`
	`699`	`+ let res = self.get_path_res(hir_id);`
`701`	`700`	`let span = path_seg.ident.span;`
`702`	`701`	`filter!(self.span_utils, span);`
`703`	`702`	`let span = self.span_from_span(span);`
`@@ -869,7 +868,8 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {`
`869`	`868`	`}`
`870`	`869`
`871`	`870`	`fn lookup_ref_id(&self, ref_id: NodeId) -> Option<DefId> {`
`872`		`- match self.get_path_res(ref_id) {`
	`871`	`+ let hir_id = self.tcx.hir().node_to_hir_id(ref_id);`
	`872`	`+ match self.get_path_res(hir_id) {`
`873`	`873`	`Res::PrimTy(_) \| Res::SelfTy(..) \| Res::Err => None,`
`874`	`874`	`def => Some(def.def_id()),`
`875`	`875`	`}`