diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-06 12:33:37 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-06 12:33:37 +0100 |
commit | 007737a0e7dd2866e02a6398d8ee4aa7d5051d8c (patch) | |
tree | 832c18b90aee7315384326be537aeb415cb5c4e1 /crates/ra_hir/src/nameres | |
parent | 2015e8b4d15c8be6c8fd735b0c08ccbbe24fb934 (diff) | |
parent | f477f2516a0fc5cf040f1f19608c0239a5ebf868 (diff) |
Merge #1779
1779: minor r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/nameres')
-rw-r--r-- | crates/ra_hir/src/nameres/mod_resolution.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crates/ra_hir/src/nameres/mod_resolution.rs b/crates/ra_hir/src/nameres/mod_resolution.rs index de81fd422..918c9591f 100644 --- a/crates/ra_hir/src/nameres/mod_resolution.rs +++ b/crates/ra_hir/src/nameres/mod_resolution.rs | |||
@@ -1,3 +1,5 @@ | |||
1 | //! This module resolves `mod foo;` declaration to file. | ||
2 | |||
1 | use std::{borrow::Cow, sync::Arc}; | 3 | use std::{borrow::Cow, sync::Arc}; |
2 | 4 | ||
3 | use ra_db::{FileId, SourceRoot}; | 5 | use ra_db::{FileId, SourceRoot}; |
@@ -77,7 +79,7 @@ pub(super) fn resolve_submodule( | |||
77 | let path = dir_path.join(file_path.as_ref()).normalize(); | 79 | let path = dir_path.join(file_path.as_ref()).normalize(); |
78 | ResolutionMode::OutOfLine(OutOfLineMode::WithAttributePath(path)) | 80 | ResolutionMode::OutOfLine(OutOfLineMode::WithAttributePath(path)) |
79 | } | 81 | } |
80 | _ => { | 82 | (None, None) => { |
81 | let is_dir_owner = is_root || mod_name == "mod"; | 83 | let is_dir_owner = is_root || mod_name == "mod"; |
82 | if is_dir_owner { | 84 | if is_dir_owner { |
83 | let file_mod = dir_path.join(format!("{}.rs", name)); | 85 | let file_mod = dir_path.join(format!("{}.rs", name)); |