squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

simplify ICE handling in HirIdValidator

Browse source
This commit is contained in:
ljedrz 2019-06-16 17:37:58 +02:00
parent 21fbb59500
commit 88961b049e
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/librustc/hir/map/hir_id_validator.rs
View file

@ -1,6 +1,5 @@
use crate::hir::def_id::{DefId, DefIndex, CRATE_DEF_INDEX}; use crate::hir::def_id::{DefId, DefIndex, CRATE_DEF_INDEX};
use crate::hir::{self, intravisit, HirId, ItemLocalId}; use crate::hir::{self, intravisit, HirId, ItemLocalId};
use syntax::ast::NodeId;
use crate::hir::itemlikevisit::ItemLikeVisitor; use crate::hir::itemlikevisit::ItemLikeVisitor;
use rustc_data_structures::fx::FxHashSet; use rustc_data_structures::fx::FxHashSet;
use rustc_data_structures::sync::{Lock, ParallelIterator, par_iter}; use rustc_data_structures::sync::{Lock, ParallelIterator, par_iter};
@ -112,17 +111,6 @@ impl<'a, 'hir: 'a> HirIdValidator<'a, 'hir> {
trace!("missing hir id {:#?}", hir_id); 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:{}]", missing_items.push(format!("[local_id: {}, node:{}]",
local_id, local_id,
self.hir_map.node_to_string(hir_id))); self.hir_map.node_to_string(hir_id)));