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

Merge #7013

Browse Source 
7013: Don't think that /submod.rs is /mod.rs r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-12-23 08:04:35 +00:00 committed by GitHub
commit 5e005cd91e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/assists/src/handlers/extract_module_to_file.rs
View File

@ -91,18 +91,18 @@ mod tests;
extract_module_to_file,
r#"
//- /main.rs
mod submodule;
//- /submodule.rs
mod submod;
//- /submod.rs
mod inner<|> {
fn f() {}
}
fn g() {}
"#,
r#"
//- /submodule.rs
//- /submod.rs
mod inner;
fn g() {}
//- /submodule/inner.rs
//- /submod/inner.rs
fn f() {}
"#,
);

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

@ -79,7 +79,7 @@ impl ModDir {
for candidate in candidate_files.iter() {
let path = AnchoredPath { anchor: file_id, path: candidate.as_str() };
if let Some(file_id) = db.resolve_path(path) {
let is_mod_rs = candidate.ends_with("mod.rs");
let is_mod_rs = candidate.ends_with("/mod.rs");
let (dir_path, root_non_dir_owner) = if is_mod_rs || attr_path.is_some() {
(DirPath::empty(), false)