nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-18 01:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

check is_include_macro only when attr_path is not specified

Browse Source 
Signed-off-by: Yilin Chen <sticnarf@gmail.com>
This commit is contained in:
Yilin Chen 2021-03-22 01:54:05 +08:00
parent 3bb9efb6b7
commit 7b693470c4
No known key found for this signature in database
GPG Key ID: 353E7ED34BF326E0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/hir_def/src/nameres/mod_resolution.rs
View File

@ -62,8 +62,7 @@ impl ModDir {
name: &Name,
attr_path: Option<&SmolStr>,
) -> Result<(FileId, bool, ModDir), String> {
let is_include_macro = file_id.is_include_macro(db.upcast());
let file_id = file_id.original_file(db.upcast());
let orig_file_id = file_id.original_file(db.upcast());
let mut candidate_files = Vec::new();
match attr_path {
@ -71,7 +70,7 @@ impl ModDir {
candidate_files.push(self.dir_path.join_attr(attr_path, self.root_non_dir_owner))
}
None => {
if is_include_macro {
if file_id.is_include_macro(db.upcast()) {
candidate_files.push(format!("{}.rs", name));
candidate_files.push(format!("{}/mod.rs", name));
} else {
@ -82,7 +81,7 @@ impl ModDir {
};
for candidate in candidate_files.iter() {
let path = AnchoredPath { anchor: file_id, path: candidate.as_str() };
let path = AnchoredPath { anchor: orig_file_id, path: candidate.as_str() };
if let Some(file_id) = db.resolve_path(path) {
let is_mod_rs = candidate.ends_with("/mod.rs");