Skip to content

Small cleanup to normalize_dependencies #16022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
epage merged 1 commit into from
Sep 29, 2025
Merged

Small cleanup to normalize_dependencies #16022

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions src/cargo/util/toml/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ fn normalize_toml(
edition,
&features,
original_toml.dependencies.as_ref(),
None,
DepKind::Normal,
&inherit,
&workspace_root,
package_root,
Expand All @@ -467,7 +467,7 @@ fn normalize_toml(
edition,
&features,
original_toml.dev_dependencies(),
Some(DepKind::Development),
DepKind::Development,
&inherit,
&workspace_root,
package_root,
Expand All @@ -487,7 +487,7 @@ fn normalize_toml(
edition,
&features,
original_toml.build_dependencies(),
Some(DepKind::Build),
DepKind::Build,
&inherit,
&workspace_root,
package_root,
Expand All @@ -500,7 +500,7 @@ fn normalize_toml(
edition,
&features,
platform.dependencies.as_ref(),
None,
DepKind::Normal,
&inherit,
&workspace_root,
package_root,
Expand All @@ -520,7 +520,7 @@ fn normalize_toml(
edition,
&features,
platform.dev_dependencies(),
Some(DepKind::Development),
DepKind::Development,
&inherit,
&workspace_root,
package_root,
Expand All @@ -540,7 +540,7 @@ fn normalize_toml(
edition,
&features,
platform.build_dependencies(),
Some(DepKind::Build),
DepKind::Build,
&inherit,
&workspace_root,
package_root,
Expand Down Expand Up @@ -873,7 +873,7 @@ fn normalize_dependencies<'a>(
edition: Edition,
features: &Features,
orig_deps: Option<&BTreeMap<manifest::PackageName, manifest::InheritableDependency>>,
kind: Option<DepKind>,
kind: DepKind,
inherit: &dyn Fn() -> CargoResult<&'a InheritableFields>,
workspace_root: &dyn Fn() -> CargoResult<&'a Path>,
package_root: &Path,
Expand Down Expand Up @@ -906,27 +906,27 @@ fn normalize_dependencies<'a>(
if d.public.is_some() {
let with_public_feature = features.require(Feature::public_dependency()).is_ok();
let with_z_public = gctx.cli_unstable().public_dependency;
if matches!(kind, None) {
if !with_public_feature && !with_z_public {
d.public = None;
warnings.push(format!(
"ignoring `public` on dependency {name_in_toml}, pass `-Zpublic-dependency` to enable support for it"
))
match kind {
DepKind::Normal => {
if !with_public_feature && !with_z_public {
d.public = None;
warnings.push(format!(
"ignoring `public` on dependency {name_in_toml}, pass `-Zpublic-dependency` to enable support for it"
));
}
}
} else {
let kind_name = match kind {
Some(k) => k.kind_table(),
None => "dependencies",
};
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.
warnings.push(hint);
d.public = None;
DepKind::Development | DepKind::Build => {
let kind_name = kind.kind_table();
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.
warnings.push(hint);
d.public = None;
}
}
}
}
Expand Down
Loading