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): Consolidate public nightly check with clearing it

Browse Source
This commit is contained in:
Ed Page 2024-03-20 20:03:09 -05:00
parent e4f1eb01c9
commit 5d2fa4497f
1 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1171,23 +1171,35 @@ fn resolve_and_validate_dependencies(
let mut resolved = resolved;
if let manifest::TomlDependency::Detailed(ref mut d) = resolved {
if d.public.is_some() {
if matches!(kind, None) {
if !manifest_ctx
.features
.require(Feature::public_dependency())
.is_ok()
&& !manifest_ctx.gctx.cli_unstable().public_dependency
let public_feature = manifest_ctx.features.require(Feature::public_dependency());
let with_public_feature = public_feature.is_ok();
let with_z_public = manifest_ctx.gctx.cli_unstable().public_dependency;
if !with_public_feature
&& (!with_z_public && !manifest_ctx.gctx.nightly_features_allowed)
{
public_feature?;
}
if matches!(kind, None) {
if !with_public_feature && !with_z_public {
d.public = None;
manifest_ctx.warnings.push(format!(
"ignoring `public` on dependency {name_in_toml}, pass `-Zpublic-dependency` to enable support for it"
))
}
} else {
let hint = format!(
"'public' specifier can only be used on regular dependencies, not {kind_name}",
);
if with_public_feature || with_z_public {
bail!(hint)
} else {
// If public feature isn't enabled in nightly, we instead warn that.
manifest_ctx.warnings.push(hint);
d.public = None;
}
}
}
}
let dep = dep_to_dependency(&resolved, name_in_toml, manifest_ctx, kind)?;
manifest_ctx.deps.push(dep);
@ -2131,27 +2143,8 @@ fn detailed_dep_to_dependency<P: ResolveToPath + Clone>(
}
if let Some(p) = orig.public {
let public_feature = manifest_ctx.features.require(Feature::public_dependency());
let with_z_public = manifest_ctx.gctx.cli_unstable().public_dependency;
let with_public_feature = public_feature.is_ok();
if !with_public_feature && (!with_z_public && !manifest_ctx.gctx.nightly_features_allowed) {
public_feature?;
}
if dep.kind() != DepKind::Normal {
let hint = format!(
"'public' specifier can only be used on regular dependencies, not {}",
dep.kind().kind_table(),
);
match (with_public_feature, with_z_public) {
(true, _) | (_, true) => bail!(hint),
// If public feature isn't enabled in nightly, we instead warn that.
(false, false) => manifest_ctx.warnings.push(hint),
}
} else {
dep.set_public(p);
}
}
if let (Some(artifact), is_lib, target) = (
orig.artifact.as_ref(),