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 | |
| 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')
| -rw-r--r-- | crates/ra_hir/src/source_binder.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs index 1661d92a2..0df7a7cb4 100644 --- a/crates/ra_hir/src/source_binder.rs +++ b/crates/ra_hir/src/source_binder.rs | |||
| @@ -286,7 +286,7 @@ impl SourceAnalyzer { | |||
| 286 | 286 | ||
| 287 | let items = self | 287 | let items = self |
| 288 | .resolver | 288 | .resolver |
| 289 | .resolve_module_path(db, &path) | 289 | .resolve_module_path_in_items(db, &path) |
| 290 | .take_types() | 290 | .take_types() |
| 291 | .map(|it| PathResolution::Def(it.into())); | 291 | .map(|it| PathResolution::Def(it.into())); |
| 292 | types.or(values).or(items).or_else(|| { | 292 | types.or(values).or(items).or_else(|| { |