diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-09 17:34:18 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-09 17:34:18 +0000 |
commit | 9a5c72d9f07760fe875ef653a956fcaa1fe5d0de (patch) | |
tree | ad4dd1306e31457b1c070d1c6c62f77e9beeb658 /crates/hir_def/src/nameres/collector.rs | |
parent | 84eed2136b1c69d50ddf4bcf313ea3aa66ed12f4 (diff) | |
parent | a430549aa6cb78e3a6c9258305b348743c4d7449 (diff) |
Merge #7878
7878: Remove `item_scope` field from `Body` r=jonas-schievink a=jonas-schievink
Closes https://github.com/rust-analyzer/rust-analyzer/issues/7632
Instead of storing an `ItemScope` filled with inner items, we store the list of `BlockId`s for all block expressions that are part of a `Body`. Code can then query the `block_def_map` for those.
bors r+
Co-authored-by: Jonas Schievink <[email protected]>
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/hir_def/src/nameres/collector.rs')
-rw-r--r-- | crates/hir_def/src/nameres/collector.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs index 3bb69d935..5bf2ba721 100644 --- a/crates/hir_def/src/nameres/collector.rs +++ b/crates/hir_def/src/nameres/collector.rs | |||
@@ -1121,7 +1121,7 @@ impl ModCollector<'_, '_> { | |||
1121 | 1121 | ||
1122 | def = Some(DefData { | 1122 | def = Some(DefData { |
1123 | id: FunctionLoc { | 1123 | id: FunctionLoc { |
1124 | container: container.into(), | 1124 | container: module.into(), |
1125 | id: ItemTreeId::new(self.file_id, id), | 1125 | id: ItemTreeId::new(self.file_id, id), |
1126 | } | 1126 | } |
1127 | .intern(self.def_collector.db) | 1127 | .intern(self.def_collector.db) |
@@ -1188,7 +1188,7 @@ impl ModCollector<'_, '_> { | |||
1188 | if let Some(name) = &it.name { | 1188 | if let Some(name) = &it.name { |
1189 | def = Some(DefData { | 1189 | def = Some(DefData { |
1190 | id: ConstLoc { | 1190 | id: ConstLoc { |
1191 | container: container.into(), | 1191 | container: module.into(), |
1192 | id: ItemTreeId::new(self.file_id, id), | 1192 | id: ItemTreeId::new(self.file_id, id), |
1193 | } | 1193 | } |
1194 | .intern(self.def_collector.db) | 1194 | .intern(self.def_collector.db) |
@@ -1228,7 +1228,7 @@ impl ModCollector<'_, '_> { | |||
1228 | 1228 | ||
1229 | def = Some(DefData { | 1229 | def = Some(DefData { |
1230 | id: TypeAliasLoc { | 1230 | id: TypeAliasLoc { |
1231 | container: container.into(), | 1231 | container: module.into(), |
1232 | id: ItemTreeId::new(self.file_id, id), | 1232 | id: ItemTreeId::new(self.file_id, id), |
1233 | } | 1233 | } |
1234 | .intern(self.def_collector.db) | 1234 | .intern(self.def_collector.db) |