Skip to content

Commit c676e35

Browse files
cjgillotcjgillot
committed
Use ItemId as a strongly typed index.
1 parent ac8961f commit c676e35

File tree

28 files changed

+63
-51
lines changed

28 files changed

+63
-51
lines changed

‎compiler/rustc_ast_lowering/src/item.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ impl<'a> Visitor<'a> for ItemLowerer<'a, '_, '_> {
5858
self.lctx.with_hir_id_owner(item.id, |lctx| {
5959
lctx.without_in_scope_lifetime_defs(|lctx| {
6060
if let Some(hir_item) = lctx.lower_item(item) {
61-
item_hir_id = Some(hir_item.hir_id);
62-
lctx.insert_item(hir_item);
61+
let id = lctx.insert_item(hir_item);
62+
item_hir_id = Some(id);
6363
}
6464
})
6565
});
@@ -128,7 +128,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
128128
// only used when lowering a child item of a trait or impl.
129129
fn with_parent_item_lifetime_defs<T>(
130130
&mut self,
131-
parent_hir_id: hir::HirId,
131+
parent_hir_id: hir::ItemId,
132132
f: impl FnOnce(&mut LoweringContext<'_, '_>) -> T,
133133
) -> T {
134134
let old_len = self.in_scope_lifetimes.len();

‎compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ struct LoweringContext<'a, 'hir: 'a> {
9999
arena: &'hir Arena<'hir>,
100100

101101
/// The items being lowered are collected here.
102-
items: BTreeMap<hir::HirId, hir::Item<'hir>>,
102+
items: BTreeMap<hir::ItemId, hir::Item<'hir>>,
103103

104104
trait_items: BTreeMap<hir::TraitItemId, hir::TraitItem<'hir>>,
105105
impl_items: BTreeMap<hir::ImplItemId, hir::ImplItem<'hir>>,
@@ -605,12 +605,14 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
605605
}
606606
}
607607

608-
fn insert_item(&mut self, item: hir::Item<'hir>) {
608+
fn insert_item(&mut self, item: hir::Item<'hir>) -> hir::ItemId {
609609
let id = item.hir_id;
610610
// FIXME: Use `debug_asset-rt`.
611611
assert_eq!(id.local_id, hir::ItemLocalId::from_u32(0));
612+
let id = hir::ItemId { id };
612613
self.items.insert(id, item);
613614
self.modules.get_mut(&self.current_module).unwrap().items.insert(id);
615+
id
614616
}
615617

616618
fn allocate_hir_id_counter(&mut self, owner: NodeId) -> hir::HirId {

‎compiler/rustc_hir/src/hir.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ pub struct WhereEqPredicate<'hir> {
619619
pub struct ModuleItems {
620620
// Use BTreeSets here so items are in the same order as in the
621621
// list of all items in Crate
622-
pub items: BTreeSet<HirId>,
622+
pub items: BTreeSet<ItemId>,
623623
pub trait_items: BTreeSet<TraitItemId>,
624624
pub impl_items: BTreeSet<ImplItemId>,
625625
pub foreign_items: BTreeSet<ForeignItemId>,
@@ -652,7 +652,7 @@ pub struct Crate<'hir> {
652652
// does, because it can affect the order in which errors are
653653
// detected, which in turn can make UI tests yield
654654
// slightly different results.
655-
pub items: BTreeMap<HirId, Item<'hir>>,
655+
pub items: BTreeMap<ItemId, Item<'hir>>,
656656

657657
pub trait_items: BTreeMap<TraitItemId, TraitItem<'hir>>,
658658
pub impl_items: BTreeMap<ImplItemId, ImplItem<'hir>>,
@@ -677,7 +677,7 @@ pub struct Crate<'hir> {
677677
}
678678

679679
impl Crate<'hir> {
680-
pub fn item(&self, id: HirId) -> &Item<'hir> {
680+
pub fn item(&self, id: ItemId) -> &Item<'hir> {
681681
&self.items[&id]
682682
}
683683

@@ -2541,7 +2541,7 @@ impl VariantData<'hir> {
25412541
// The bodies for items are stored "out of line", in a separate
25422542
// hashmap in the `Crate`. Here we just record the hir-id of the item
25432543
// so it can fetched later.
2544-
#[derive(Copy, Clone, Encodable, Debug)]
2544+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Encodable, Debug)]
25452545
pub struct ItemId {
25462546
pub id: HirId,
25472547
}

‎compiler/rustc_hir/src/intravisit.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ pub trait Map<'hir> {
133133
/// Retrieves the `Node` corresponding to `id`, returning `None` if cannot be found.
134134
fn find(&self, hir_id: HirId) -> Option<Node<'hir>>;
135135
fn body(&self, id: BodyId) -> &'hir Body<'hir>;
136-
fn item(&self, id: HirId) -> &'hir Item<'hir>;
136+
fn item(&self, id: ItemId) -> &'hir Item<'hir>;
137137
fn trait_item(&self, id: TraitItemId) -> &'hir TraitItem<'hir>;
138138
fn impl_item(&self, id: ImplItemId) -> &'hir ImplItem<'hir>;
139139
fn foreign_item(&self, id: ForeignItemId) -> &'hir ForeignItem<'hir>;
@@ -150,7 +150,7 @@ impl<'hir> Map<'hir> for ErasedMap<'hir> {
150150
fn body(&self, id: BodyId) -> &'hir Body<'hir> {
151151
self.0.body(id)
152152
}
153-
fn item(&self, id: HirId) -> &'hir Item<'hir> {
153+
fn item(&self, id: ItemId) -> &'hir Item<'hir> {
154154
self.0.item(id)
155155
}
156156
fn trait_item(&self, id: TraitItemId) -> &'hir TraitItem<'hir> {
@@ -269,7 +269,7 @@ pub trait Visitor<'v>: Sized {
269269
/// reason to override this method is if you want a nested pattern
270270
/// but cannot supply a `Map`; see `nested_visit_map` for advice.
271271
fn visit_nested_item(&mut self, id: ItemId) {
272-
let opt_item = self.nested_visit_map().inter().map(|map| map.item(id.id));
272+
let opt_item = self.nested_visit_map().inter().map(|map| map.item(id));
273273
walk_list!(self, visit_item, opt_item);
274274
}
275275

‎compiler/rustc_hir/src/stable_hash_impls.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,15 @@ impl<HirCtx: crate::HashStableContext> ToStableHashKey<HirCtx> for HirId {
3434
}
3535
}
3636

37+
impl<HirCtx: crate::HashStableContext> ToStableHashKey<HirCtx> for ItemId {
38+
type KeyType = (DefPathHash, ItemLocalId);
39+
40+
#[inline]
41+
fn to_stable_hash_key(&self, hcx: &HirCtx) -> (DefPathHash, ItemLocalId) {
42+
self.id.to_stable_hash_key(hcx)
43+
}
44+
}
45+
3746
impl<HirCtx: crate::HashStableContext> ToStableHashKey<HirCtx> for TraitItemId {
3847
type KeyType = (DefPathHash, ItemLocalId);
3948

‎compiler/rustc_hir_pretty/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub const NO_ANN: &dyn PpAnn = &NoAnn;
5454
impl PpAnn for hir::Crate<'_> {
5555
fn nested(&self, state: &mut State<'_>, nested: Nested) {
5656
match nested {
57-
Nested::Item(id) => state.print_item(self.item(id.id)),
57+
Nested::Item(id) => state.print_item(self.item(id)),
5858
Nested::TraitItem(id) => state.print_trait_item(self.trait_item(id)),
5959
Nested::ImplItem(id) => state.print_impl_item(self.impl_item(id)),
6060
Nested::ForeignItem(id) => state.print_foreign_item(self.foreign_item(id)),
@@ -69,7 +69,7 @@ impl PpAnn for hir::Crate<'_> {
6969
impl PpAnn for &dyn rustc_hir::intravisit::Map<'_> {
7070
fn nested(&self, state: &mut State<'_>, nested: Nested) {
7171
match nested {
72-
Nested::Item(id) => state.print_item(self.item(id.id)),
72+
Nested::Item(id) => state.print_item(self.item(id)),
7373
Nested::TraitItem(id) => state.print_trait_item(self.trait_item(id)),
7474
Nested::ImplItem(id) => state.print_impl_item(self.impl_item(id)),
7575
Nested::ForeignItem(id) => state.print_foreign_item(self.foreign_item(id)),

‎compiler/rustc_infer/src/infer/error_reporting/nice_region_error/static_impl_trait.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
234234
}
235235
match fn_return.kind {
236236
TyKind::OpaqueDef(item_id, _) => {
237-
let item = tcx.hir().item(item_id.id);
237+
let item = tcx.hir().item(item_id);
238238
let opaque = if let ItemKind::OpaqueTy(opaque) = &item.kind {
239239
opaque
240240
} else {

‎compiler/rustc_lint/src/late.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ impl<'tcx, T: LateLintPass<'tcx>> hir_visit::Visitor<'tcx> for LateContextAndPas
178178
}
179179

180180
fn visit_stmt(&mut self, s: &'tcx hir::Stmt<'tcx>) {
181-
let get_item = |id: hir::ItemId| self.context.tcx.hir().item(id.id);
181+
let get_item = |id: hir::ItemId| self.context.tcx.hir().item(id);
182182
let attrs = &s.kind.attrs(get_item);
183183
// See `EarlyContextAndPass::visit_stmt` for an explanation
184184
// of why we call `walk_stmt` outside of `with_lint_attrs`

‎compiler/rustc_middle/src/hir/map/collector.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ impl<'a, 'hir> Visitor<'hir> for NodeCollector<'a, 'hir> {
309309

310310
fn visit_nested_item(&mut self, item: ItemId) {
311311
debug!("visit_nested_item: {:?}", item);
312-
self.visit_item(self.krate.item(item.id));
312+
self.visit_item(self.krate.item(item));
313313
}
314314

315315
fn visit_nested_trait_item(&mut self, item_id: TraitItemId) {

‎compiler/rustc_middle/src/hir/map/mod.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,8 @@ impl<'hir> Map<'hir> {
300300
self.find_entry(id).unwrap()
301301
}
302302

303-
pub fn item(&self, id: HirId) -> &'hir Item<'hir> {
304-
match self.find(id).unwrap() {
303+
pub fn item(&self, id: ItemId) -> &'hir Item<'hir> {
304+
match self.find(id.id).unwrap() {
305305
Node::Item(item) => item,
306306
_ => bug!(),
307307
}
@@ -479,19 +479,19 @@ impl<'hir> Map<'hir> {
479479
let module = self.tcx.hir_module_items(module);
480480

481481
for id in &module.items {
482-
visitor.visit_item(self.expect_item(*id));
482+
visitor.visit_item(self.item(*id));
483483
}
484484

485485
for id in &module.trait_items {
486-
visitor.visit_trait_item(self.expect_trait_item(id.hir_id));
486+
visitor.visit_trait_item(self.trait_item(*id));
487487
}
488488

489489
for id in &module.impl_items {
490-
visitor.visit_impl_item(self.expect_impl_item(id.hir_id));
490+
visitor.visit_impl_item(self.impl_item(*id));
491491
}
492492

493493
for id in &module.foreign_items {
494-
visitor.visit_foreign_item(self.expect_foreign_item(id.hir_id));
494+
visitor.visit_foreign_item(self.foreign_item(*id));
495495
}
496496
}
497497

@@ -863,7 +863,7 @@ impl<'hir> Map<'hir> {
863863
Node::Variant(ref v) => &v.attrs[..],
864864
Node::Field(ref f) => &f.attrs[..],
865865
Node::Expr(ref e) => &*e.attrs,
866-
Node::Stmt(ref s) => s.kind.attrs(|id| self.item(id.id)),
866+
Node::Stmt(ref s) => s.kind.attrs(|id| self.item(id)),
867867
Node::Arm(ref a) => &*a.attrs,
868868
Node::GenericParam(param) => &param.attrs[..],
869869
// Unit/tuple structs/variants take the attributes straight from
@@ -977,7 +977,7 @@ impl<'hir> intravisit::Map<'hir> for Map<'hir> {
977977
self.body(id)
978978
}
979979

980-
fn item(&self, id: HirId) -> &'hir Item<'hir> {
980+
fn item(&self, id: ItemId) -> &'hir Item<'hir> {
981981
self.item(id)
982982
}
983983

‎compiler/rustc_middle/src/ich/impls_hir.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ impl<'ctx> rustc_hir::HashStableContext for StableHashingContext<'ctx> {
5555
let item_ids_hash = item_ids
5656
.iter()
5757
.map(|id| {
58-
let (def_path_hash, local_id) = id.id.to_stable_hash_key(hcx);
58+
let (def_path_hash, local_id) = id.to_stable_hash_key(hcx);
5959
debug_assert_eq!(local_id, hir::ItemLocalId::from_u32(0));
6060
def_path_hash.0
6161
})

‎compiler/rustc_middle/src/ty/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ impl<'v> hir::intravisit::Visitor<'v> for TraitObjectVisitor<'v> {
289289
}
290290
hir::TyKind::OpaqueDef(item_id, _) => {
291291
self.0.push(ty);
292-
let item = self.1.expect_item(item_id.id);
292+
let item = self.1.item(item_id);
293293
hir::intravisit::walk_item(self, item);
294294
}
295295
_ => {}

‎compiler/rustc_mir/src/borrow_check/diagnostics/region_name.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
767767
let hir = self.infcx.tcx.hir();
768768

769769
if let hir::TyKind::OpaqueDef(id, _) = hir_ty.kind {
770-
let opaque_ty = hir.item(id.id);
770+
let opaque_ty = hir.item(id);
771771
if let hir::ItemKind::OpaqueTy(hir::OpaqueTy {
772772
bounds:
773773
[hir::GenericBound::LangItemTrait(

‎compiler/rustc_passes/src/dead.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ impl<'tcx> Visitor<'tcx> for MarkSymbolVisitor<'tcx> {
329329

330330
fn visit_ty(&mut self, ty: &'tcx hir::Ty<'tcx>) {
331331
if let TyKind::OpaqueDef(item_id, _) = ty.kind {
332-
let item = self.tcx.hir().expect_item(item_id.id);
332+
let item = self.tcx.hir().item(item_id);
333333
intravisit::walk_item(self, item);
334334
}
335335
intravisit::walk_ty(self, ty);

‎compiler/rustc_passes/src/hir_stats.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ impl<'v> hir_visit::Visitor<'v> for StatCollector<'v> {
100100
}
101101

102102
fn visit_nested_item(&mut self, id: hir::ItemId) {
103-
let nested_item = self.krate.unwrap().item(id.id);
103+
let nested_item = self.krate.unwrap().item(id);
104104
self.visit_item(nested_item)
105105
}
106106

‎compiler/rustc_privacy/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -588,8 +588,8 @@ impl EmbargoVisitor<'tcx> {
588588
.map(|module_hir_id| self.tcx.hir().expect_item(module_hir_id))
589589
{
590590
if let hir::ItemKind::Mod(m) = &item.kind {
591-
for item_id in m.item_ids {
592-
let item = self.tcx.hir().expect_item(item_id.id);
591+
for &item_id in m.item_ids {
592+
let item = self.tcx.hir().item(item_id);
593593
let def_id = self.tcx.hir().local_def_id(item_id.id);
594594
if !self.tcx.hygienic_eq(segment.ident, item.ident, def_id.to_def_id()) {
595595
continue;

‎compiler/rustc_resolve/src/late/lifetimes.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
587587
// `type MyAnonTy<'b> = impl MyTrait<'b>;`
588588
// ^ ^ this gets resolved in the scope of
589589
// the opaque_ty generics
590-
let opaque_ty = self.tcx.hir().expect_item(item_id.id);
590+
let opaque_ty = self.tcx.hir().item(item_id);
591591
let (generics, bounds) = match opaque_ty.kind {
592592
// Named opaque `impl Trait` types are reached via `TyKind::Path`.
593593
// This arm is for `impl Trait` in the types of statics, constants and locals.
@@ -632,11 +632,12 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
632632
let hir_id = self.tcx.hir().local_def_id_to_hir_id(def_id);
633633
// Ensure that the parent of the def is an item, not HRTB
634634
let parent_id = self.tcx.hir().get_parent_node(hir_id);
635+
let parent_item_id = hir::ItemId { id: parent_id };
635636
let parent_impl_id = hir::ImplItemId { hir_id: parent_id };
636637
let parent_trait_id = hir::TraitItemId { hir_id: parent_id };
637638
let krate = self.tcx.hir().krate();
638639

639-
if !(krate.items.contains_key(&parent_id)
640+
if !(krate.items.contains_key(&parent_item_id)
640641
|| krate.impl_items.contains_key(&parent_impl_id)
641642
|| krate.trait_items.contains_key(&parent_trait_id))
642643
{

‎compiler/rustc_save_analysis/src/dump_visitor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@ impl<'tcx> Visitor<'tcx> for DumpVisitor<'tcx> {
13821382
});
13831383
}
13841384
hir::TyKind::OpaqueDef(item_id, _) => {
1385-
let item = self.tcx.hir().item(item_id.id);
1385+
let item = self.tcx.hir().item(item_id);
13861386
self.nest_typeck_results(self.tcx.hir().local_def_id(item_id.id), |v| {
13871387
v.visit_item(item)
13881388
});

‎compiler/rustc_save_analysis/src/sig.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ impl<'hir> Sig for hir::Ty<'hir> {
317317
Ok(replace_text(nested_ty, text))
318318
}
319319
hir::TyKind::OpaqueDef(item_id, _) => {
320-
let item = scx.tcx.hir().item(item_id.id);
320+
let item = scx.tcx.hir().item(item_id);
321321
item.make(offset, Some(item_id.id), scx)
322322
}
323323
hir::TyKind::Typeof(_) | hir::TyKind::Infer | hir::TyKind::Err => Err("Ty"),

‎compiler/rustc_typeck/src/astconv/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2210,7 +2210,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
22102210
self.res_to_ty(opt_self_ty, path, false)
22112211
}
22122212
hir::TyKind::OpaqueDef(item_id, ref lifetimes) => {
2213-
let opaque_ty = tcx.hir().expect_item(item_id.id);
2213+
let opaque_ty = tcx.hir().item(item_id);
22142214
let def_id = tcx.hir().local_def_id(item_id.id).to_def_id();
22152215

22162216
match opaque_ty.kind {

‎compiler/rustc_typeck/src/check/method/suggest.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1445,8 +1445,8 @@ impl intravisit::Visitor<'tcx> for UsePlacementFinder<'tcx> {
14451445
return;
14461446
}
14471447
// Find a `use` statement.
1448-
for item_id in module.item_ids {
1449-
let item = self.tcx.hir().expect_item(item_id.id);
1448+
for &item_id in module.item_ids {
1449+
let item = self.tcx.hir().item(item_id);
14501450
match item.kind {
14511451
hir::ItemKind::Use(..) => {
14521452
// Don't suggest placing a `use` before the prelude

‎src/librustdoc/clean/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ impl Clean<ExternalCrate> for CrateNum {
133133
.item_ids
134134
.iter()
135135
.filter_map(|&id| {
136-
let item = cx.tcx.hir().expect_item(id.id);
136+
let item = cx.tcx.hir().item(id);
137137
match item.kind {
138138
hir::ItemKind::Mod(_) => as_primitive(Res::Def(
139139
DefKind::Mod,
@@ -185,7 +185,7 @@ impl Clean<ExternalCrate> for CrateNum {
185185
.item_ids
186186
.iter()
187187
.filter_map(|&id| {
188-
let item = cx.tcx.hir().expect_item(id.id);
188+
let item = cx.tcx.hir().item(id);
189189
match item.kind {
190190
hir::ItemKind::Mod(_) => as_keyword(Res::Def(
191191
DefKind::Mod,
@@ -1475,7 +1475,7 @@ impl Clean<Type> for hir::Ty<'_> {
14751475
}
14761476
TyKind::Tup(ref tys) => Tuple(tys.clean(cx)),
14771477
TyKind::OpaqueDef(item_id, _) => {
1478-
let item = cx.tcx.hir().expect_item(item_id.id);
1478+
let item = cx.tcx.hir().item(item_id);
14791479
if let hir::ItemKind::OpaqueTy(ref ty) = item.kind {
14801480
ImplTrait(ty.bounds.clean(cx))
14811481
} else {

‎src/librustdoc/visit_ast.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
132132
// Keep track of if there were any private modules in the path.
133133
let orig_inside_public_path = self.inside_public_path;
134134
self.inside_public_path &= vis.node.is_pub();
135-
for i in m.item_ids {
136-
let item = self.cx.tcx.hir().expect_item(i.id);
135+
for &i in m.item_ids {
136+
let item = self.cx.tcx.hir().item(i);
137137
self.visit_item(item, None, &mut om);
138138
}
139139
self.inside_public_path = orig_inside_public_path;
@@ -231,8 +231,8 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
231231
let ret = match tcx.hir().get(res_hir_id) {
232232
Node::Item(&hir::Item { kind: hir::ItemKind::Mod(ref m), .. }) if glob => {
233233
let prev = mem::replace(&mut self.inlining, true);
234-
for i in m.item_ids {
235-
let i = self.cx.tcx.hir().expect_item(i.id);
234+
for &i in m.item_ids {
235+
let i = self.cx.tcx.hir().item(i);
236236
self.visit_item(i, None, om);
237237
}
238238
self.inlining = prev;

‎src/tools/clippy/clippy_lints/src/lifetimes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ impl<'a, 'tcx> Visitor<'tcx> for RefVisitor<'a, 'tcx> {
375375
match ty.kind {
376376
TyKind::OpaqueDef(item, _) => {
377377
let map = self.cx.tcx.hir();
378-
let item = map.expect_item(item.id);
378+
let item = map.item(item);
379379
walk_item(self, item);
380380
walk_ty(self, ty);
381381
},

0 commit comments

Comments
 (0)