Skip to content

Rollup of 5 pull requests #61915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jun 18, 2019
Merged

Rollup of 5 pull requests #61915

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2e9931f
test more variants of enum-int-casting
RalfJung Jun 9, 2019
af0e35e
Help LLVM better optimize slice::Iter(Mut)::len
scottmcm Jun 16, 2019
387ac06
make `Weak::ptr_eq`s into methods
chpio Jun 16, 2019
ccb2dfb
don't ICE on large files
matklad Jun 17, 2019
61964d9
replace some uses of NodeId with HirId
ljedrz Jun 14, 2019
d996c4d
remove _by_hir_id if there is no NodeId counterpart
ljedrz Jun 14, 2019
1c8551b
renamve hir_to_string to node_to_string
ljedrz Jun 16, 2019
21fbb59
fix a HIR doc, simplify one HIR-related function call
ljedrz Jun 16, 2019
88961b0
simplify ICE handling in HirIdValidator
ljedrz Jun 16, 2019
72bb5c7
change NodeId to HirId in some HIR docs
ljedrz Jun 16, 2019
61e004d
fix rebase fallout
ljedrz Jun 17, 2019
e1bf56d
remove superfluous space
ljedrz Jun 17, 2019
a2259aa
Rollup merge of #61702 - RalfJung:const-enum-cast, r=oli-obk
Centril Jun 17, 2019
0800b6e
Rollup merge of #61836 - ljedrz:i_still_hate_node_ids, r=ljedrz
Centril Jun 17, 2019
2d3d0b7
Rollup merge of #61885 - scottmcm:slice-iter-len-opt, r=rkruppe,RalfJung
Centril Jun 17, 2019
04d6539
Rollup merge of #61893 - chpio:weak_ptr_eq_methods, r=rkruppe
Centril Jun 17, 2019
6fe2653
Rollup merge of #61908 - matklad:overflow, r=petrochenkov
Centril Jun 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
simplify ICE handling in HirIdValidator
  • Loading branch information
@ljedrz
ljedrz committed Jun 17, 2019
commit 88961b049ec2e8dec3f7b1c8166fb201c0632bbe
12 changes: 0 additions & 12 deletions src/librustc/hir/map/hir_id_validator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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};
Expand Down Expand Up @@ -112,17 +111,6 @@ impl<'a, 'hir: 'a> HirIdValidator<'a, 'hir> {

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)));
Expand Down