diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-01 11:13:25 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-12-01 11:13:25 +0000 |
commit | ec164fbb68a4252ef56497ba95501c0f4417ef4e (patch) | |
tree | 904a0248de4794e650898c00be116fcec36c19e0 /crates/ra_hir_def/src/body.rs | |
parent | 780f476b4f438d473bc2e2299c2b8bf0a6fb9257 (diff) | |
parent | cfc6e9e36646aa3b961018be875a7c3474aa7577 (diff) |
Merge #2455
2455: Add BuiltinShadowMode r=flodiebold a=edwin0cheng
This PR try to fix #1905 by introduce an `BuiltinShadowMode` in name resolving functions.
cc @flodiebold
Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src/body.rs')
-rw-r--r-- | crates/ra_hir_def/src/body.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crates/ra_hir_def/src/body.rs b/crates/ra_hir_def/src/body.rs index 69508dd8a..239f35229 100644 --- a/crates/ra_hir_def/src/body.rs +++ b/crates/ra_hir_def/src/body.rs | |||
@@ -15,7 +15,7 @@ use rustc_hash::FxHashMap; | |||
15 | use crate::{ | 15 | use crate::{ |
16 | db::DefDatabase, | 16 | db::DefDatabase, |
17 | expr::{Expr, ExprId, Pat, PatId}, | 17 | expr::{Expr, ExprId, Pat, PatId}, |
18 | nameres::CrateDefMap, | 18 | nameres::{BuiltinShadowMode, CrateDefMap}, |
19 | path::Path, | 19 | path::Path, |
20 | src::HasSource, | 20 | src::HasSource, |
21 | DefWithBodyId, HasModule, Lookup, ModuleId, | 21 | DefWithBodyId, HasModule, Lookup, ModuleId, |
@@ -83,7 +83,10 @@ impl Expander { | |||
83 | } | 83 | } |
84 | 84 | ||
85 | fn resolve_path_as_macro(&self, db: &impl DefDatabase, path: &Path) -> Option<MacroDefId> { | 85 | fn resolve_path_as_macro(&self, db: &impl DefDatabase, path: &Path) -> Option<MacroDefId> { |
86 | self.crate_def_map.resolve_path(db, self.module.local_id, path).0.take_macros() | 86 | self.crate_def_map |
87 | .resolve_path(db, self.module.local_id, path, BuiltinShadowMode::Other) | ||
88 | .0 | ||
89 | .take_macros() | ||
87 | } | 90 | } |
88 | } | 91 | } |
89 | 92 | ||