itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(toml): Pull out unused warning code

Browse Source
This commit is contained in:
Ed Page 2024-03-14 16:39:21 -05:00
parent 8cd94e4cc4
commit a7b70e98f9
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/cargo/util/toml/mod.rs
View File

@ -186,15 +186,6 @@ fn convert_toml(
) -> CargoResult<(EitherManifest, Vec<PathBuf>)> {
let package_root = manifest_file.parent().unwrap();
let add_unused = |warnings: &mut Warnings| {
for key in unused {
warnings.add_warning(format!("unused manifest key: {}", key));
if key == "profiles.debug" {
warnings.add_warning("use `[profile.dev]` to configure debug builds".to_string());
}
}
};
if let Some(deps) = manifest
.workspace
.as_ref()
@ -213,7 +204,7 @@ fn convert_toml(
let embedded = is_embedded(manifest_file);
let (mut manifest, paths) =
to_real_manifest(manifest, embedded, source_id, package_root, gctx)?;
add_unused(manifest.warnings_mut());
warn_on_unused(&unused, manifest.warnings_mut());
if manifest.targets().iter().all(|t| t.is_custom_build()) {
bail!(
"no targets specified in the manifest\n\
@ -224,7 +215,7 @@ fn convert_toml(
Ok((EitherManifest::Real(manifest), paths))
} else {
let (mut m, paths) = to_virtual_manifest(manifest, source_id, package_root, gctx)?;
add_unused(m.warnings_mut());
warn_on_unused(&unused, m.warnings_mut());
Ok((EitherManifest::Virtual(m), paths))
};
}
@ -263,6 +254,15 @@ fn warn_on_deprecated(new_path: &str, name: &str, kind: &str, warnings: &mut Vec
))
}
fn warn_on_unused(unused: &BTreeSet<String>, warnings: &mut Warnings) {
for key in unused {
warnings.add_warning(format!("unused manifest key: {}", key));
if key == "profiles.debug" {
warnings.add_warning("use `[profile.dev]` to configure debug builds".to_string());
}
}
}
/// Prepares the manifest for publishing.
// - Path and git components of dependency specifications are removed.
// - License path is updated to point within the package.