diff --git a/src/librustc/hir/intravisit.rs b/src/librustc/hir/intravisit.rs
index 977830315e23e..23d02a440c5a2 100644
--- a/src/librustc/hir/intravisit.rs
+++ b/src/librustc/hir/intravisit.rs
@@ -163,7 +163,7 @@ pub trait Visitor<'v> : Sized {
/// but cannot supply a `Map`; see `nested_visit_map` for advice.
#[allow(unused_variables)]
fn visit_nested_item(&mut self, id: ItemId) {
- let opt_item = self.nested_visit_map().inter().map(|map| map.expect_item(id.id));
+ let opt_item = self.nested_visit_map().inter().map(|map| map.expect_item_by_hir_id(id.id));
if let Some(item) = opt_item {
self.visit_item(item);
}
diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs
index 949fdd2682b96..6c9de320b7b62 100644
--- a/src/librustc/hir/lowering.rs
+++ b/src/librustc/hir/lowering.rs
@@ -82,7 +82,7 @@ pub struct LoweringContext<'a> {
resolver: &'a mut dyn Resolver,
/// The items being lowered are collected here.
- items: BTreeMap<NodeId, hir::Item>,
+ items: BTreeMap<hir::HirId, hir::Item>,
trait_items: BTreeMap<hir::TraitItemId, hir::TraitItem>,
impl_items: BTreeMap<hir::ImplItemId, hir::ImplItem>,
@@ -323,7 +323,7 @@ enum AnonymousLifetimeMode {
PassThrough,
}
-struct ImplTraitTypeIdVisitor<'a> { ids: &'a mut SmallVec<[hir::ItemId; 1]> }
+struct ImplTraitTypeIdVisitor<'a> { ids: &'a mut SmallVec<[NodeId; 1]> }
impl<'a, 'b> Visitor<'a> for ImplTraitTypeIdVisitor<'b> {
fn visit_ty(&mut self, ty: &'a Ty) {
@@ -332,7 +332,7 @@ impl<'a, 'b> Visitor<'a> for ImplTraitTypeIdVisitor<'b> {
| TyKind::BareFn(_)
=> return,
- TyKind::ImplTrait(id, _) => self.ids.push(hir::ItemId { id }),
+ TyKind::ImplTrait(id, _) => self.ids.push(id),
_ => {},
}
visit::walk_ty(self, ty);
@@ -436,17 +436,16 @@ impl<'a> LoweringContext<'a> {
}
fn visit_item(&mut self, item: &'lcx Item) {
- let mut item_lowered = true;
+ let mut item_hir_id = None;
self.lctx.with_hir_id_owner(item.id, |lctx| {
if let Some(hir_item) = lctx.lower_item(item) {
- lctx.insert_item(item.id, hir_item);
- } else {
- item_lowered = false;
+ item_hir_id = Some(hir_item.hir_id);
+ lctx.insert_item(hir_item);
}
});
- if item_lowered {
- let item_generics = match self.lctx.items.get(&item.id).unwrap().node {
+ if let Some(hir_id) = item_hir_id {
+ let item_generics = match self.lctx.items.get(&hir_id).unwrap().node {
hir::ItemKind::Impl(_, _, _, ref generics, ..)
| hir::ItemKind::Trait(_, _, ref generics, ..) => {
generics.params.clone()
@@ -519,7 +518,8 @@ impl<'a> LoweringContext<'a> {
}
}
- fn insert_item(&mut self, id: NodeId, item: hir::Item) {
+ fn insert_item(&mut self, item: hir::Item) {
+ let id = item.hir_id;
self.items.insert(id, item);
self.modules.get_mut(&self.current_module).unwrap().items.insert(id);
}
@@ -1425,10 +1425,10 @@ impl<'a> LoweringContext<'a> {
// Insert the item into the global list. This usually happens
// automatically for all AST items. But this existential type item
// does not actually exist in the AST.
- lctx.insert_item(exist_ty_id.node_id, exist_ty_item);
+ lctx.insert_item(exist_ty_item);
// `impl Trait` now just becomes `Foo<'a, 'b, ..>`.
- hir::TyKind::Def(hir::ItemId { id: exist_ty_id.node_id }, lifetimes)
+ hir::TyKind::Def(hir::ItemId { id: exist_ty_id.hir_id }, lifetimes)
})
}
@@ -2003,9 +2003,9 @@ impl<'a> LoweringContext<'a> {
)
}
- fn lower_local(&mut self, l: &Local) -> (hir::Local, SmallVec<[hir::ItemId; 1]>) {
+ fn lower_local(&mut self, l: &Local) -> (hir::Local, SmallVec<[NodeId; 1]>) {
let LoweredNodeId { node_id: _, hir_id } = self.lower_node_id(l.id);
- let mut ids = SmallVec::<[hir::ItemId; 1]>::new();
+ let mut ids = SmallVec::<[NodeId; 1]>::new();
if self.sess.features_untracked().impl_trait_in_bindings {
if let Some(ref ty) = l.ty {
let mut visitor = ImplTraitTypeIdVisitor { ids: &mut ids };
@@ -3122,7 +3122,6 @@ impl<'a> LoweringContext<'a> {
let vis = respan(vis.span, vis_kind);
this.insert_item(
- new_id.node_id,
hir::Item {
hir_id: new_id.hir_id,
ident,
@@ -3227,7 +3226,6 @@ impl<'a> LoweringContext<'a> {
let vis = respan(vis.span, vis_kind);
this.insert_item(
- new_id,
hir::Item {
hir_id: new_hir_id,
ident,
@@ -3451,17 +3449,17 @@ impl<'a> LoweringContext<'a> {
}
fn lower_item_id(&mut self, i: &Item) -> SmallVec<[hir::ItemId; 1]> {
- match i.node {
+ let node_ids = match i.node {
ItemKind::Use(ref use_tree) => {
- let mut vec = smallvec![hir::ItemId { id: i.id }];
+ let mut vec = smallvec![i.id];
self.lower_item_id_use_tree(use_tree, i.id, &mut vec);
vec
}
ItemKind::MacroDef(..) => SmallVec::new(),
ItemKind::Fn(..) |
- ItemKind::Impl(.., None, _, _) => smallvec![hir::ItemId { id: i.id }],
+ ItemKind::Impl(.., None, _, _) => smallvec![i.id],
ItemKind::Static(ref ty, ..) => {
- let mut ids = smallvec![hir::ItemId { id: i.id }];
+ let mut ids = smallvec![i.id];
if self.sess.features_untracked().impl_trait_in_bindings {
let mut visitor = ImplTraitTypeIdVisitor { ids: &mut ids };
visitor.visit_ty(ty);
@@ -3469,25 +3467,29 @@ impl<'a> LoweringContext<'a> {
ids
},
ItemKind::Const(ref ty, ..) => {
- let mut ids = smallvec![hir::ItemId { id: i.id }];
+ let mut ids = smallvec![i.id];
if self.sess.features_untracked().impl_trait_in_bindings {
let mut visitor = ImplTraitTypeIdVisitor { ids: &mut ids };
visitor.visit_ty(ty);
}
ids
},
- _ => smallvec![hir::ItemId { id: i.id }],
- }
+ _ => smallvec![i.id],
+ };
+
+ node_ids.into_iter()
+ .map(|node_id| hir::ItemId { id: self.lower_node_id(node_id).hir_id })
+ .collect()
}
fn lower_item_id_use_tree(&mut self,
tree: &UseTree,
base_id: NodeId,
- vec: &mut SmallVec<[hir::ItemId; 1]>)
+ vec: &mut SmallVec<[NodeId; 1]>)
{
match tree.kind {
UseTreeKind::Nested(ref nested_vec) => for &(ref nested, id) in nested_vec {
- vec.push(hir::ItemId { id });
+ vec.push(id);
self.lower_item_id_use_tree(nested, id, vec);
},
UseTreeKind::Glob => {}
@@ -3496,7 +3498,7 @@ impl<'a> LoweringContext<'a> {
.skip(1)
.zip([id1, id2].iter())
{
- vec.push(hir::ItemId { id });
+ vec.push(id);
}
},
}
@@ -4611,6 +4613,7 @@ impl<'a> LoweringContext<'a> {
let mut ids: SmallVec<[hir::Stmt; 1]> = item_ids
.into_iter()
.map(|item_id| {
+ let item_id = hir::ItemId { id: self.lower_node_id(item_id).hir_id };
let LoweredNodeId { node_id: _, hir_id } = self.next_id();
hir::Stmt {
diff --git a/src/librustc/hir/map/mod.rs b/src/librustc/hir/map/mod.rs
index 86b6805cc9b4c..d657fe25a3379 100644
--- a/src/librustc/hir/map/mod.rs
+++ b/src/librustc/hir/map/mod.rs
@@ -614,7 +614,7 @@ impl<'hir> Map<'hir> {
let module = &self.forest.krate.modules[&node_id];
for id in &module.items {
- visitor.visit_item(self.expect_item(*id));
+ visitor.visit_item(self.expect_item_by_hir_id(*id));
}
for id in &module.trait_items {
@@ -1292,7 +1292,7 @@ pub fn map_crate<'hir>(sess: &crate::session::Session,
impl<'hir> print::PpAnn for Map<'hir> {
fn nested(&self, state: &mut print::State<'_>, nested: print::Nested) -> io::Result<()> {
match nested {
- Nested::Item(id) => state.print_item(self.expect_item(id.id)),
+ Nested::Item(id) => state.print_item(self.expect_item_by_hir_id(id.id)),
Nested::TraitItem(id) => state.print_trait_item(self.trait_item(id)),
Nested::ImplItem(id) => state.print_impl_item(self.impl_item(id)),
Nested::Body(id) => state.print_expr(&self.body(id).value),
diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs
index e47bc3d1c2533..e8fafd55400e2 100644
--- a/src/librustc/hir/mod.rs
+++ b/src/librustc/hir/mod.rs
@@ -694,7 +694,7 @@ pub struct WhereEqPredicate {
pub struct ModuleItems {
// Use BTreeSets here so items are in the same order as in the
// list of all items in Crate
- pub items: BTreeSet<NodeId>,
+ pub items: BTreeSet<HirId>,
pub trait_items: BTreeSet<TraitItemId>,
pub impl_items: BTreeSet<ImplItemId>,
}
@@ -718,7 +718,7 @@ pub struct Crate {
// does, because it can affect the order in which errors are
// detected, which in turn can make compile-fail tests yield
// slightly different results.
- pub items: BTreeMap<NodeId, Item>,
+ pub items: BTreeMap<HirId, Item>,
pub trait_items: BTreeMap<TraitItemId, TraitItem>,
pub impl_items: BTreeMap<ImplItemId, ImplItem>,
@@ -738,7 +738,7 @@ pub struct Crate {
}
impl Crate {
- pub fn item(&self, id: NodeId) -> &Item {
+ pub fn item(&self, id: HirId) -> &Item {
&self.items[&id]
}
@@ -2200,7 +2200,7 @@ impl VariantData {
// so it can fetched later.
#[derive(Copy, Clone, RustcEncodable, RustcDecodable, Debug)]
pub struct ItemId {
- pub id: NodeId,
+ pub id: HirId,
}
/// An item
diff --git a/src/librustc/hir/print.rs b/src/librustc/hir/print.rs
index 54a21f2ed5c2a..5b94270c5f5cf 100644
--- a/src/librustc/hir/print.rs
+++ b/src/librustc/hir/print.rs
@@ -48,7 +48,7 @@ pub trait PpAnn {
fn post(&self, _state: &mut State<'_>, _node: AnnNode<'_>) -> io::Result<()> {
Ok(())
}
- fn try_fetch_item(&self, _: ast::NodeId) -> Option<&hir::Item> {
+ fn try_fetch_item(&self, _: hir::HirId) -> Option<&hir::Item> {
None
}
}
@@ -58,7 +58,7 @@ impl PpAnn for NoAnn {}
pub const NO_ANN: &dyn PpAnn = &NoAnn;
impl PpAnn for hir::Crate {
- fn try_fetch_item(&self, item: ast::NodeId) -> Option<&hir::Item> {
+ fn try_fetch_item(&self, item: hir::HirId) -> Option<&hir::Item> {
Some(self.item(item))
}
fn nested(&self, state: &mut State<'_>, nested: Nested) -> io::Result<()> {
diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs
index f862b690f8806..f5c78a20b0a9c 100644
--- a/src/librustc/middle/resolve_lifetime.rs
+++ b/src/librustc/middle/resolve_lifetime.rs
@@ -637,7 +637,8 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
// `abstract type MyAnonTy<'b>: MyTrait<'b>;`
// ^ ^ this gets resolved in the scope of
// the exist_ty generics
- let (generics, bounds) = match self.tcx.hir().expect_item(item_id.id).node {
+ let (generics, bounds) = match self.tcx.hir().expect_item_by_hir_id(item_id.id).node
+ {
// named existential types are reached via TyKind::Path
// this arm is for `impl Trait` in the types of statics, constants and locals
hir::ItemKind::Existential(hir::ExistTy {
@@ -677,8 +678,8 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
let parent_impl_id = hir::ImplItemId { hir_id: parent_id };
let parent_trait_id = hir::TraitItemId { hir_id: parent_id };
let krate = self.tcx.hir().forest.krate();
- let parent_node_id = self.tcx.hir().hir_to_node_id(parent_id);
- if !(krate.items.contains_key(&parent_node_id)
+
+ if !(krate.items.contains_key(&parent_id)
|| krate.impl_items.contains_key(&parent_impl_id)
|| krate.trait_items.contains_key(&parent_trait_id))
{
diff --git a/src/librustc_metadata/encoder.rs b/src/librustc_metadata/encoder.rs
index ce0618d4599e7..e6ff7eb0ce2e5 100644
--- a/src/librustc_metadata/encoder.rs
+++ b/src/librustc_metadata/encoder.rs
@@ -644,7 +644,7 @@ impl<'a, 'b: 'a, 'tcx: 'b> IsolatedEncoder<'a, 'b, 'tcx> {
span: self.lazy(&tcx.def_span(def_id)),
attributes: self.encode_attributes(attrs),
children: self.lazy_seq(md.item_ids.iter().map(|item_id| {
- tcx.hir().local_def_id(item_id.id).index
+ tcx.hir().local_def_id_from_hir_id(item_id.id).index
})),
stability: self.encode_stability(def_id),
deprecation: self.encode_deprecation(def_id),
diff --git a/src/librustc_privacy/lib.rs b/src/librustc_privacy/lib.rs
index 52514a3ca97d6..dbb368363ea1f 100644
--- a/src/librustc_privacy/lib.rs
+++ b/src/librustc_privacy/lib.rs
@@ -462,8 +462,8 @@ impl<'a, 'tcx> EmbargoVisitor<'a, 'tcx> {
{
if let hir::ItemKind::Mod(m) = &item.node {
for item_id in m.item_ids.as_ref() {
- let item = self.tcx.hir().expect_item(item_id.id);
- let def_id = self.tcx.hir().local_def_id(item_id.id);
+ let item = self.tcx.hir().expect_item_by_hir_id(item_id.id);
+ let def_id = self.tcx.hir().local_def_id_from_hir_id(item_id.id);
if !self.tcx.hygienic_eq(segment.ident, item.ident, def_id) { continue; }
if let hir::ItemKind::Use(..) = item.node {
self.update(item.hir_id, Some(AccessLevel::Exported));
@@ -724,8 +724,7 @@ impl<'a, 'tcx> Visitor<'tcx> for EmbargoVisitor<'a, 'tcx> {
unreachable!()
};
for id in &module.item_ids {
- let hir_id = self.tcx.hir().node_to_hir_id(id.id);
- self.update(hir_id, level);
+ self.update(id.id, level);
}
let def_id = self.tcx.hir().local_def_id_from_hir_id(module_id);
if let Some(exports) = self.tcx.module_exports(def_id) {
diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs
index 89ec92a652160..742e9b3b7a7c8 100644
--- a/src/librustc_typeck/astconv.rs
+++ b/src/librustc_typeck/astconv.rs
@@ -1812,7 +1812,7 @@ impl<'o, 'gcx: 'tcx, 'tcx> dyn AstConv<'gcx, 'tcx> + 'o {
self.def_to_ty(opt_self_ty, path, false)
}
hir::TyKind::Def(item_id, ref lifetimes) => {
- let did = tcx.hir().local_def_id(item_id.id);
+ let did = tcx.hir().local_def_id_from_hir_id(item_id.id);
self.impl_trait_ty_to_ty(did, lifetimes)
},
hir::TyKind::Path(hir::QPath::TypeRelative(ref qself, ref segment)) => {
diff --git a/src/librustc_typeck/check/method/suggest.rs b/src/librustc_typeck/check/method/suggest.rs
index 4bf6471a6293c..fd3b33417e078 100644
--- a/src/librustc_typeck/check/method/suggest.rs
+++ b/src/librustc_typeck/check/method/suggest.rs
@@ -827,7 +827,7 @@ impl<'a, 'tcx, 'gcx> hir::intravisit::Visitor<'tcx> for UsePlacementFinder<'a, '
}
// Find a `use` statement.
for item_id in &module.item_ids {
- let item = self.tcx.hir().expect_item(item_id.id);
+ let item = self.tcx.hir().expect_item_by_hir_id(item_id.id);
match item.node {
hir::ItemKind::Use(..) => {
// Don't suggest placing a `use` before the prelude
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
index f2bf7ead5619b..401325a51ad0f 100644
--- a/src/librustdoc/clean/mod.rs
+++ b/src/librustdoc/clean/mod.rs
@@ -277,16 +277,16 @@ impl Clean<ExternalCrate> for CrateNum {
};
let primitives = if root.is_local() {
cx.tcx.hir().krate().module.item_ids.iter().filter_map(|&id| {
- let item = cx.tcx.hir().expect_item(id.id);
+ let item = cx.tcx.hir().expect_item_by_hir_id(id.id);
match item.node {
hir::ItemKind::Mod(_) => {
- as_primitive(Def::Mod(cx.tcx.hir().local_def_id(id.id)))
+ as_primitive(Def::Mod(cx.tcx.hir().local_def_id_from_hir_id(id.id)))
}
hir::ItemKind::Use(ref path, hir::UseKind::Single)
if item.vis.node.is_pub() => {
as_primitive(path.def).map(|(_, prim, attrs)| {
// Pretend the primitive is local.
- (cx.tcx.hir().local_def_id(id.id), prim, attrs)
+ (cx.tcx.hir().local_def_id_from_hir_id(id.id), prim, attrs)
})
}
_ => None
@@ -319,15 +319,15 @@ impl Clean<ExternalCrate> for CrateNum {
};
let keywords = if root.is_local() {
cx.tcx.hir().krate().module.item_ids.iter().filter_map(|&id| {
- let item = cx.tcx.hir().expect_item(id.id);
+ let item = cx.tcx.hir().expect_item_by_hir_id(id.id);
match item.node {
hir::ItemKind::Mod(_) => {
- as_keyword(Def::Mod(cx.tcx.hir().local_def_id(id.id)))
+ as_keyword(Def::Mod(cx.tcx.hir().local_def_id_from_hir_id(id.id)))
}
hir::ItemKind::Use(ref path, hir::UseKind::Single)
if item.vis.node.is_pub() => {
as_keyword(path.def).map(|(_, prim, attrs)| {
- (cx.tcx.hir().local_def_id(id.id), prim, attrs)
+ (cx.tcx.hir().local_def_id_from_hir_id(id.id), prim, attrs)
})
}
_ => None
@@ -2557,7 +2557,7 @@ impl Clean<Type> for hir::Ty {
},
TyKind::Tup(ref tys) => Tuple(tys.clean(cx)),
TyKind::Def(item_id, _) => {
- let item = cx.tcx.hir().expect_item(item_id.id);
+ let item = cx.tcx.hir().expect_item_by_hir_id(item_id.id);
if let hir::ItemKind::Existential(ref ty) = item.node {
ImplTrait(ty.bounds.clean(cx))
} else {
@@ -4170,10 +4170,10 @@ pub fn path_to_def_local(tcx: &TyCtxt<'_, '_, '_>, path: &[&str]) -> Option<DefI
let segment = path_it.next()?;
for item_id in mem::replace(&mut items, HirVec::new()).iter() {
- let item = tcx.hir().expect_item(item_id.id);
+ let item = tcx.hir().expect_item_by_hir_id(item_id.id);
if item.ident.name == *segment {
if path_it.peek().is_none() {
- return Some(tcx.hir().local_def_id(item_id.id))
+ return Some(tcx.hir().local_def_id_from_hir_id(item_id.id))
}
items = match &item.node {
diff --git a/src/librustdoc/visit_ast.rs b/src/librustdoc/visit_ast.rs
index 0c99f6ddeddf1..5b93b147621db 100644
--- a/src/librustdoc/visit_ast.rs
+++ b/src/librustdoc/visit_ast.rs
@@ -245,7 +245,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
let orig_inside_public_path = self.inside_public_path;
self.inside_public_path &= vis.node.is_pub();
for i in &m.item_ids {
- let item = self.cx.tcx.hir().expect_item(i.id);
+ let item = self.cx.tcx.hir().expect_item_by_hir_id(i.id);
self.visit_item(item, None, &mut om);
}
self.inside_public_path = orig_inside_public_path;
@@ -342,7 +342,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
Node::Item(&hir::Item { node: hir::ItemKind::Mod(ref m), .. }) if glob => {
let prev = mem::replace(&mut self.inlining, true);
for i in &m.item_ids {
- let i = self.cx.tcx.hir().expect_item(i.id);
+ let i = self.cx.tcx.hir().expect_item_by_hir_id(i.id);
self.visit_item(i, None, om);
}
self.inlining = prev;