Revert "Remove NodeId to HirId conversion APIs"

This reverts commit a98f35f.

Author: marmeladema

src/librustc_hir/definitions.rs

@@ -328,7 +328,7 @@ impl Definitions {
     #[inline]
     pub fn local_def_id(&self, node: ast::NodeId) -> LocalDefId {
         self.opt_local_def_id(node).unwrap_or_else(|| {
-            panic!("no entry for node id: `{:?}` / `{:?}`", node, self.node_id_to_hir_id.get(node))
+            panic!("no entry for node id: `{:?}` / `{:?}`", node, self.opt_node_id_to_hir_id(node))
         })
     }
 
@@ -342,6 +342,16 @@ impl Definitions {
         self.hir_id_to_node_id[&hir_id]
     }
 
+    #[inline]
+    pub fn node_id_to_hir_id(&self, node_id: ast::NodeId) -> hir::HirId {
+        self.node_id_to_hir_id[node_id].unwrap()
+    }
+
+    #[inline]
+    pub fn opt_node_id_to_hir_id(&self, node_id: ast::NodeId) -> Option<hir::HirId> {
+        self.node_id_to_hir_id[node_id]
+    }
+
     #[inline]
     pub fn local_def_id_to_hir_id(&self, id: LocalDefId) -> hir::HirId {
         let node_id = self.def_id_to_node_id[id];

src/librustc_middle/hir/map/collector.rs

@@ -243,6 +243,7 @@ impl<'a, 'hir> NodeCollector<'a, 'hir> {
         // owner of that node.
         if cfg!(debug_assertions) {
             let node_id = self.definitions.hir_id_to_node_id(hir_id);
+            assert_eq!(self.definitions.node_id_to_hir_id(node_id), hir_id);
 
             if hir_id.owner != self.current_dep_node_owner {
                 let node_str = match self.definitions.opt_local_def_id(node_id) {