diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-14 18:16:48 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-12-14 18:16:48 +0000 |
commit | d6223253b628b279f9ddae8f83f7173d01f6b32c (patch) | |
tree | 12f2ccc5c52c1c0b67932d3a35fe18668b8e5d62 /crates/ra_hir_def/src/nameres.rs | |
parent | 202ad1e2d9376565cb273cf085be600ed10e5a93 (diff) | |
parent | 2619950b3b405324ab1c1745876165c834b3b4b9 (diff) |
Merge #2561
2561: Split generic and non-generic paths r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src/nameres.rs')
-rw-r--r-- | crates/ra_hir_def/src/nameres.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs index bd237a7b3..9aae7e48e 100644 --- a/crates/ra_hir_def/src/nameres.rs +++ b/crates/ra_hir_def/src/nameres.rs | |||
@@ -74,7 +74,7 @@ use crate::{ | |||
74 | builtin_type::BuiltinType, | 74 | builtin_type::BuiltinType, |
75 | db::DefDatabase, | 75 | db::DefDatabase, |
76 | nameres::{diagnostics::DefDiagnostic, path_resolution::ResolveMode}, | 76 | nameres::{diagnostics::DefDiagnostic, path_resolution::ResolveMode}, |
77 | path::Path, | 77 | path::ModPath, |
78 | per_ns::PerNs, | 78 | per_ns::PerNs, |
79 | AstId, FunctionId, ImplId, LocalImportId, LocalModuleId, ModuleDefId, ModuleId, TraitId, | 79 | AstId, FunctionId, ImplId, LocalImportId, LocalModuleId, ModuleDefId, ModuleId, TraitId, |
80 | }; | 80 | }; |
@@ -329,7 +329,7 @@ impl CrateDefMap { | |||
329 | &self, | 329 | &self, |
330 | db: &impl DefDatabase, | 330 | db: &impl DefDatabase, |
331 | original_module: LocalModuleId, | 331 | original_module: LocalModuleId, |
332 | path: &Path, | 332 | path: &ModPath, |
333 | shadow: BuiltinShadowMode, | 333 | shadow: BuiltinShadowMode, |
334 | ) -> (PerNs, Option<usize>) { | 334 | ) -> (PerNs, Option<usize>) { |
335 | let res = | 335 | let res = |