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 | |
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')
-rw-r--r-- | crates/hir/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index 638398e29..c6d424c48 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs | |||
@@ -1157,7 +1157,7 @@ where | |||
1157 | { | 1157 | { |
1158 | match id.lookup(db.upcast()).container { | 1158 | match id.lookup(db.upcast()).container { |
1159 | AssocContainerId::TraitId(_) | AssocContainerId::ImplId(_) => Some(ctor(DEF::from(id))), | 1159 | AssocContainerId::TraitId(_) | AssocContainerId::ImplId(_) => Some(ctor(DEF::from(id))), |
1160 | AssocContainerId::ContainerId(_) => None, | 1160 | AssocContainerId::ModuleId(_) => None, |
1161 | } | 1161 | } |
1162 | } | 1162 | } |
1163 | 1163 | ||
@@ -1185,7 +1185,7 @@ impl AssocItem { | |||
1185 | match container { | 1185 | match container { |
1186 | AssocContainerId::TraitId(id) => AssocItemContainer::Trait(id.into()), | 1186 | AssocContainerId::TraitId(id) => AssocItemContainer::Trait(id.into()), |
1187 | AssocContainerId::ImplId(id) => AssocItemContainer::Impl(id.into()), | 1187 | AssocContainerId::ImplId(id) => AssocItemContainer::Impl(id.into()), |
1188 | AssocContainerId::ContainerId(_) => panic!("invalid AssocItem"), | 1188 | AssocContainerId::ModuleId(_) => panic!("invalid AssocItem"), |
1189 | } | 1189 | } |
1190 | } | 1190 | } |
1191 | 1191 | ||