nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 11:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #8221

Browse Source 
8221: Prefer adding `mod` declaration to lib.rs over file.rs in UnlinkedFile fix r=Veykril a=Veykril

When there is a `lib.rs` and `main.rs` in one crate, one usually wants the `lib.rs` file to declare the modules.
bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2021-03-27 22:43:34 +00:00 committed by GitHub
commit ce6bb5ccca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ide/src/diagnostics/unlinked_file.rs
View File

@ -63,7 +63,7 @@ impl DiagnosticWithFix for UnlinkedFile {
// - `$dir.rs` in the parent folder, where `$dir` is the directory containing `self.file_id` // - `$dir.rs` in the parent folder, where `$dir` is the directory containing `self.file_id`
let parent = our_path.parent()?; let parent = our_path.parent()?;
let mut paths = let mut paths =
vec![parent.join("mod.rs")?, parent.join("main.rs")?, parent.join("lib.rs")?]; vec![parent.join("mod.rs")?, parent.join("lib.rs")?, parent.join("main.rs")?];
// `submod/bla.rs` -> `submod.rs` // `submod/bla.rs` -> `submod.rs`
if let Some(newmod) = (|| { if let Some(newmod) = (|| {