diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-05 14:15:31 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-06-05 14:15:31 +0100 |
| commit | d06df2c3e7e2b6eacda29cb1c715f1a1f2ada032 (patch) | |
| tree | a1a1439aa2cd1b4cba3c559f41bfbde24a08aa36 /crates/ra_hir_def/src/nameres | |
| parent | f98d057218ca30d052da2a119fa0b3108ba3a091 (diff) | |
| parent | cb9d9040f7e5cb5971deabe3b66045010576a689 (diff) | |
Merge #4756
4756: Cleanup resolution of file paths r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src/nameres')
| -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()) { |