bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Do not store stable_crate_id again in Definitions.

Browse source
This commit is contained in:
Camille GILLOT 2023-12-24 01:06:58 +00:00
parent 027fa9e23b
commit 75ad81ce93
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_hir/src/definitions.rs
View file

@ -103,9 +103,6 @@ impl DefPathTable {
pub struct Definitions { pub struct Definitions {
table: DefPathTable, table: DefPathTable,
next_disambiguator: UnordMap<(LocalDefId, DefPathData), u32>, next_disambiguator: UnordMap<(LocalDefId, DefPathData), u32>,
/// The [StableCrateId] of the local crate.
stable_crate_id: StableCrateId,
} }
/// A unique identifier that we can use to lookup a definition /// A unique identifier that we can use to lookup a definition
@ -340,7 +337,7 @@ impl Definitions {
let root = LocalDefId { local_def_index: table.allocate(key, def_path_hash) }; let root = LocalDefId { local_def_index: table.allocate(key, def_path_hash) };
assert_eq!(root.local_def_index, CRATE_DEF_INDEX); assert_eq!(root.local_def_index, CRATE_DEF_INDEX);
Definitions { table, next_disambiguator: Default::default(), stable_crate_id } Definitions { table, next_disambiguator: Default::default() }
} }
/// Adds a definition with a parent definition. /// Adds a definition with a parent definition.
@ -382,7 +379,7 @@ impl Definitions {
hash: DefPathHash, hash: DefPathHash,
err: &mut dyn FnMut() -> !, err: &mut dyn FnMut() -> !,
) -> LocalDefId { ) -> LocalDefId {
debug_assert!(hash.stable_crate_id() == self.stable_crate_id); debug_assert!(hash.stable_crate_id() == self.table.stable_crate_id);
self.table self.table
.def_path_hash_to_index .def_path_hash_to_index
.get(&hash) .get(&hash)