diff options
| author | Mikhail Rakhmanov <[email protected]> | 2020-06-13 07:42:15 +0100 |
|---|---|---|
| committer | Mikhail Rakhmanov <[email protected]> | 2020-06-13 07:42:15 +0100 |
| commit | 16bbf4ab7f132e6e5e5318dccdef9a5d71afdd7f (patch) | |
| tree | 4b79fa8c046be56b02427ba843e70cdf3ac05767 /crates/ra_hir_def/src/nameres/mod_resolution.rs | |
| parent | eeb8b9e236796da8734ba81a49164864497f7226 (diff) | |
| parent | b56ad148db0c69eb279c225f45d324b4e80e7367 (diff) | |
Merge branch 'master' into keyword_completion
# Conflicts:
# docs/user/generated_features.adoc
Diffstat (limited to 'crates/ra_hir_def/src/nameres/mod_resolution.rs')
| -rw-r--r-- | crates/ra_hir_def/src/nameres/mod_resolution.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir_def/src/nameres/mod_resolution.rs b/crates/ra_hir_def/src/nameres/mod_resolution.rs index 386c5cade..cede4a6fc 100644 --- a/crates/ra_hir_def/src/nameres/mod_resolution.rs +++ b/crates/ra_hir_def/src/nameres/mod_resolution.rs | |||
| @@ -61,7 +61,7 @@ impl ModDir { | |||
| 61 | }; | 61 | }; |
| 62 | 62 | ||
| 63 | for candidate in candidate_files.iter() { | 63 | for candidate in candidate_files.iter() { |
| 64 | if let Some(file_id) = db.resolve_relative_path(file_id, candidate) { | 64 | if let Some(file_id) = db.resolve_path(file_id, candidate.as_str()) { |
| 65 | let mut root_non_dir_owner = false; | 65 | let mut root_non_dir_owner = false; |
| 66 | let mut mod_path = RelativePathBuf::new(); | 66 | let mut mod_path = RelativePathBuf::new(); |
| 67 | if !(candidate.ends_with("mod.rs") || attr_path.is_some()) { | 67 | if !(candidate.ends_with("mod.rs") || attr_path.is_some()) { |