diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-23 08:04:35 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-12-23 08:04:35 +0000 |
commit | 5e005cd91e3582808e8af9b14dcbe2b2874ba093 (patch) | |
tree | c90d4fd9f9520044e870355b6fb791c9e95354a3 /crates/hir_def | |
parent | 58b6763f206b80a3000eb3c7642181fa5fb98229 (diff) | |
parent | 2c84c2d07af013006b8092c7303aa8c73f677fea (diff) |
Merge #7013
7013: Don't think that /submod.rs is /mod.rs r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/hir_def')
-rw-r--r-- | crates/hir_def/src/nameres/mod_resolution.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir_def/src/nameres/mod_resolution.rs b/crates/hir_def/src/nameres/mod_resolution.rs index b4ccd4488..af3262439 100644 --- a/crates/hir_def/src/nameres/mod_resolution.rs +++ b/crates/hir_def/src/nameres/mod_resolution.rs | |||
@@ -79,7 +79,7 @@ impl ModDir { | |||
79 | for candidate in candidate_files.iter() { | 79 | for candidate in candidate_files.iter() { |
80 | let path = AnchoredPath { anchor: file_id, path: candidate.as_str() }; | 80 | let path = AnchoredPath { anchor: file_id, path: candidate.as_str() }; |
81 | if let Some(file_id) = db.resolve_path(path) { | 81 | if let Some(file_id) = db.resolve_path(path) { |
82 | let is_mod_rs = candidate.ends_with("mod.rs"); | 82 | let is_mod_rs = candidate.ends_with("/mod.rs"); |
83 | 83 | ||
84 | let (dir_path, root_non_dir_owner) = if is_mod_rs || attr_path.is_some() { | 84 | let (dir_path, root_non_dir_owner) = if is_mod_rs || attr_path.is_some() { |
85 | (DirPath::empty(), false) | 85 | (DirPath::empty(), false) |