itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-25 11:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

target_path_not_found_error_message: simplify

Browse Source
This commit is contained in:
Marijn Schouten 2025-06-29 09:01:20 +00:00
parent 56602aacd1
commit 81c233badd
1 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/cargo/util/toml/targets.rs
View File

@ -958,18 +958,12 @@ fn target_path_not_found_error_message(
match (kind, commonly_wrong) { match (kind, commonly_wrong) {
// commonly wrong paths // commonly wrong paths
("test" | "bench" | "example", true) => target_path.push(kind), ("test" | "bench" | "example", true) => target_path.push(kind),
("bin", true) => { ("bin", true) => target_path.extend(["src", "bins"]),
target_path.push("src");
target_path.push("bins");
}
// default inferred paths // default inferred paths
("test", false) => target_path.push(DEFAULT_TEST_DIR_NAME), ("test", false) => target_path.push(DEFAULT_TEST_DIR_NAME),
("bench", false) => target_path.push(DEFAULT_BENCH_DIR_NAME), ("bench", false) => target_path.push(DEFAULT_BENCH_DIR_NAME),
("example", false) => target_path.push(DEFAULT_EXAMPLE_DIR_NAME), ("example", false) => target_path.push(DEFAULT_EXAMPLE_DIR_NAME),
("bin", false) => { ("bin", false) => target_path.extend(["src", "bin"]),
target_path.push("src");
target_path.push("bin");
}
_ => unreachable!("invalid target kind: {}", kind), _ => unreachable!("invalid target kind: {}", kind),
} }
@ -988,36 +982,26 @@ fn target_path_not_found_error_message(
let target_name = name_or_panic(target); let target_name = name_or_panic(target);
let commonly_wrong_paths = possible_target_paths(&target_name, target_kind, true); let commonly_wrong_paths = possible_target_paths(&target_name, target_kind, true);
let possible_paths = possible_target_paths(&target_name, target_kind, false); let possible_paths = possible_target_paths(&target_name, target_kind, false);
let existing_wrong_path_index = match (
package_root.join(&commonly_wrong_paths[0]).exists(),
package_root.join(&commonly_wrong_paths[1]).exists(),
) {
(true, _) => Some(0),
(_, true) => Some(1),
_ => None,
};
if let Some(i) = existing_wrong_path_index { if let Some((wrong_path, possible_path)) = commonly_wrong_paths
return format!( .iter()
"\ .zip(possible_paths.iter())
can't find `{name}` {kind} at default paths, but found a file at `{wrong_path}`. .filter(|(wp, _)| package_root.join(wp).exists())
Perhaps rename the file to `{possible_path}` for target auto-discovery, \ .next()
or specify {kind}.path if you want to use a non-default path.", {
name = target_name, let [wrong_path, possible_path] = [wrong_path, possible_path].map(|p| p.display());
kind = target_kind, format!(
wrong_path = commonly_wrong_paths[i].display(), "can't find `{target_name}` {target_kind} at default paths, but found a file at `{wrong_path}`.\n\
possible_path = possible_paths[i].display(), Perhaps rename the file to `{possible_path}` for target auto-discovery, \
); or specify {target_kind}.path if you want to use a non-default path."
)
} else {
let [path_file, path_dir] = possible_paths.each_ref().map(|p| p.display());
format!(
"can't find `{target_name}` {target_kind} at `{path_file}` or `{path_dir}`. \
Please specify {target_kind}.path if you want to use a non-default path."
)
} }
format!(
"can't find `{name}` {kind} at `{path_file}` or `{path_dir}`. \
Please specify {kind}.path if you want to use a non-default path.",
name = target_name,
kind = target_kind,
path_file = possible_paths[0].display(),
path_dir = possible_paths[1].display(),
)
} }
fn target_path( fn target_path(