diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-02-02 11:37:45 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-02-02 11:37:45 +0000 |
commit | 8720f7f14688257d320de44e1354c62fce1a6bcf (patch) | |
tree | d5cbb565fbcdb5378ab4dbc4cf885933eb39eedd /crates/hir_def/src/nameres.rs | |
parent | 157156276b32c4edca337e6389dc70a203c7c681 (diff) | |
parent | cd9659ffcee35ade2148162a9b77f8d74656d43e (diff) |
Merge #7518
7518: Use the right `DefMap` when looking up modules r=jonas-schievink a=jonas-schievink
Fixes the bugs encountered in https://github.com/rust-analyzer/rust-analyzer/pull/7506#issuecomment-771417467
bors r+
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/hir_def/src/nameres.rs')
-rw-r--r-- | crates/hir_def/src/nameres.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crates/hir_def/src/nameres.rs b/crates/hir_def/src/nameres.rs index 6169b3bbc..5efc2fe47 100644 --- a/crates/hir_def/src/nameres.rs +++ b/crates/hir_def/src/nameres.rs | |||
@@ -258,6 +258,10 @@ impl DefMap { | |||
258 | self.krate | 258 | self.krate |
259 | } | 259 | } |
260 | 260 | ||
261 | pub(crate) fn block_id(&self) -> Option<BlockId> { | ||
262 | self.block.as_ref().map(|block| block.block) | ||
263 | } | ||
264 | |||
261 | pub(crate) fn prelude(&self) -> Option<ModuleId> { | 265 | pub(crate) fn prelude(&self) -> Option<ModuleId> { |
262 | self.prelude | 266 | self.prelude |
263 | } | 267 | } |