]> git.lizzy.rs Git - rust.git/commitdiff
simplify ICE handling in HirIdValidator
authorljedrz <ljedrz@gmail.com>
Sun, 16 Jun 2019 15:37:58 +0000 (17:37 +0200)
committerljedrz <ljedrz@gmail.com>
Mon, 17 Jun 2019 16:59:27 +0000 (18:59 +0200)
src/librustc/hir/map/hir_id_validator.rs

index d6ac7ea2ed703cd93582a7a8d99ac941e3488ffc..32d0e069f72deb0881d53406408eb6d306c81103 100644 (file)
@@ -1,6 +1,5 @@
 use crate::hir::def_id::{DefId, DefIndex, CRATE_DEF_INDEX};
 use crate::hir::{self, intravisit, HirId, ItemLocalId};
-use syntax::ast::NodeId;
 use crate::hir::itemlikevisit::ItemLikeVisitor;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::sync::{Lock, ParallelIterator, par_iter};
@@ -112,17 +111,6 @@ fn check<F: FnOnce(&mut HirIdValidator<'a, 'hir>)>(&mut self,
 
                 trace!("missing hir id {:#?}", hir_id);
 
-                // We are already in ICE mode here, so doing a linear search
-                // should be fine.
-                let (node_id, _) = self.hir_map
-                                       .definitions()
-                                       .node_to_hir_id
-                                       .iter()
-                                       .enumerate()
-                                       .find(|&(_, &entry)| hir_id == entry)
-                                       .expect("no node_to_hir_id entry");
-                let node_id = NodeId::from_usize(node_id);
-                let hir_id = self.hir_map.node_to_hir_id(node_id);
                 missing_items.push(format!("[local_id: {}, node:{}]",
                                            local_id,
                                            self.hir_map.node_to_string(hir_id)));