Skip to content

Commit

Permalink
fix(publish): Report all unpublishable packages
Browse files Browse the repository at this point in the history
I didn't extend this to multiple packages restricted to specific
registries.
It seems less likely to be a problem and more complex to gather and
report.

This was inspired by feedback left at #10948
  • Loading branch information
epage committed Jan 16, 2025
1 parent a282233 commit 1eafdb2
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
19 changes: 11 additions & 8 deletions src/cargo/ops/registry/publish.rs
Original file line number Diff line number Diff line change
Expand Up @@ -703,14 +703,17 @@ fn package_list(pkgs: impl IntoIterator<Item = PackageId>, final_sep: &str) -> S
}

fn validate_registry(pkgs: &[&Package], reg_or_index: Option<&RegistryOrIndex>) -> CargoResult<()> {
for pkg in pkgs {
if pkg.publish() == &Some(Vec::new()) {
bail!(
"`{}` cannot be published.\n\
`package.publish` must be set to `true` or a non-empty list in Cargo.toml to publish.",
pkg.name(),
);
}
let unpublishable = pkgs
.iter()
.filter(|pkg| pkg.publish() == &Some(Vec::new()))
.map(|pkg| format!("`{}`", pkg.name()))
.collect::<Vec<_>>();
if !unpublishable.is_empty() {
bail!(
"{} cannot be published.\n\
`package.publish` must be set to `true` or a non-empty list in Cargo.toml to publish.",
unpublishable.join(", ")
);
}

let reg_name = match reg_or_index {
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/publish.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4105,7 +4105,7 @@ fn multiple_unpublishable_package() {
.masquerade_as_nightly_cargo(&["package-workspace"])
.with_status(101)
.with_stderr_data(str![[r#"
[ERROR] `dep` cannot be published.
[ERROR] `dep`, `main` cannot be published.
`package.publish` must be set to `true` or a non-empty list in Cargo.toml to publish.
"#]])
Expand Down

0 comments on commit 1eafdb2

Please sign in to comment.