Skip to content

Commit 17ffb59

Browse files
committed
Index def_ids directly
1 parent af6299a commit 17ffb59

File tree

2 files changed

+4
-20
lines changed

2 files changed

+4
-20
lines changed

compiler/rustc_smir/src/rustc_internal/mod.rs

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fn with_tables<R>(mut f: impl FnMut(&mut Tables<'_>) -> R) -> R {
2121
}
2222

2323
pub fn item_def_id(item: &stable_mir::CrateItem) -> DefId {
24-
with_tables(|t| t.item_def_id(item))
24+
with_tables(|t| t[item.0])
2525
}
2626

2727
pub fn crate_item(did: DefId) -> stable_mir::CrateItem {
@@ -78,22 +78,6 @@ impl<'tcx> Index<stable_mir::DefId> for Tables<'tcx> {
7878
}
7979

8080
impl<'tcx> Tables<'tcx> {
81-
pub fn item_def_id(&self, item: &stable_mir::CrateItem) -> DefId {
82-
self[item.0]
83-
}
84-
85-
pub fn trait_def_id(&self, trait_def: &stable_mir::ty::TraitDef) -> DefId {
86-
self[trait_def.0]
87-
}
88-
89-
pub fn impl_trait_def_id(&self, impl_def: &stable_mir::ty::ImplDef) -> DefId {
90-
self[impl_def.0]
91-
}
92-
93-
pub fn generic_def_id(&self, generic_def: &stable_mir::ty::GenericDef) -> DefId {
94-
self[generic_def.0]
95-
}
96-
9781
pub fn crate_item(&mut self, did: DefId) -> stable_mir::CrateItem {
9882
stable_mir::CrateItem(self.create_def_id(did))
9983
}

compiler/rustc_smir/src/rustc_smir/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ impl<'tcx> Context for Tables<'tcx> {
5454
}
5555

5656
fn trait_decl(&mut self, trait_def: &stable_mir::ty::TraitDef) -> stable_mir::ty::TraitDecl {
57-
let def_id = self.trait_def_id(trait_def);
57+
let def_id = self[trait_def.0];
5858
let trait_def = self.tcx.trait_def(def_id);
5959
trait_def.stable(self)
6060
}
@@ -68,13 +68,13 @@ impl<'tcx> Context for Tables<'tcx> {
6868
}
6969

7070
fn trait_impl(&mut self, impl_def: &stable_mir::ty::ImplDef) -> stable_mir::ty::ImplTrait {
71-
let def_id = self.impl_trait_def_id(impl_def);
71+
let def_id = self[impl_def.0];
7272
let impl_trait = self.tcx.impl_trait_ref(def_id).unwrap();
7373
impl_trait.stable(self)
7474
}
7575

7676
fn mir_body(&mut self, item: &stable_mir::CrateItem) -> stable_mir::mir::Body {
77-
let def_id = self.item_def_id(item);
77+
let def_id = self[item.0];
7878
let mir = self.tcx.optimized_mir(def_id);
7979
stable_mir::mir::Body {
8080
blocks: mir

0 commit comments

Comments
 (0)