superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scripts: rust: emit path candidates in panic message 

Include all information in the panic message rather than emit fragments
to stderr to avoid possible interleaving with other output.

Signed-off-by: Tamir Duberstein <tamird@gmail.com>
Link: https://lore.kernel.org/r/20250529-idiomatic-match-slice-v2-2-4925ca2f1550@gmail.com
[ Kept newlines using `writeln!`. Used new message from Tamir. Reworded
  title. - Miguel ]
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
pull/1320/head
Tamir Duberstein 2025-05-29 09:14:59 -04:00 committed by Miguel Ojeda
parent 8b097b5ac6
commit 2254991d5b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/rustdoc_test_gen.rs
View File

@ -92,13 +92,15 @@ fn find_real_path<'a>(srctree: &Path, valid_paths: &'a mut Vec<PathBuf>, file: &
), ),
[valid_path] => valid_path.to_str().unwrap(), [valid_path] => valid_path.to_str().unwrap(),
valid_paths => { valid_paths => {
eprintln!("Several path candidates found:"); use std::fmt::Write;
let mut candidates = String::new();
for path in valid_paths { for path in valid_paths {
eprintln!(" {path:?}"); writeln!(&mut candidates, " {path:?}").unwrap();
} }
panic!( panic!(
"Several path candidates found for `{file}`, please resolve the ambiguity by \ "Several path candidates found for `{file}`, please resolve the ambiguity by \
renaming a file or folder." renaming a file or folder. Candidates:\n{candidates}",
); );
} }
} }