Infer registry #14340

jneem · 2024-08-01T13:45:03Z

While working on cargo publish for workspaces, I noticed a few ways in which the registry inference for cargo package seemed wrong. (This only affects the unstable -Zpackage-workspace feature.) This is all about the interaction between --index/--registry, and the package.publish fields.

Previously, if multiple crates were packaged and they had different package.publish settings, we would ignore those setting and fall back to "crates-io". After this PR, we will bail out with an error instead (unless they've specified --registry or --index).
Previously, we would validate the inferred registry against the package.publish settings, even if the --index argument would have taken precedence. After this PR, we will skip registry validation in this case.
Previously, we were just ignoring the registry value inferred from package.publish: we'd validate that it was ok, but then just not use it.

rustbot · 2024-08-01T13:45:07Z

r? @ehuss

rustbot has assigned @ehuss.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

tests/testsuite/package.rs

src/cargo/ops/cargo_package.rs

tests/testsuite/package.rs

src/cargo/ops/cargo_package.rs

jneem · 2024-08-05T04:28:14Z

I'm mystified by the failure in the build-std tests. When I run it locally I don't get the [UPDATING] line, but it seems to be reliably present in CI. (Also, I don't see why this PR would affect that test)

jneem · 2024-08-07T14:30:09Z

Ok, I rebased and the mysterious build-std error seems to have gone away.

tests/testsuite/package.rs

Infer the package registry only if all packages have the same publish field. If there is confusion, bail out instead of defaulting to crates-io.

epage · 2024-08-07T14:58:52Z

@bors r+

bors · 2024-08-07T14:58:55Z

📌 Commit 275d3b6 has been approved by epage

It is now in the queue for this repository.

bors · 2024-08-07T15:00:19Z

⌛ Testing commit 275d3b6 with merge 495d02c...

bors · 2024-08-07T15:29:40Z

☀️ Test successful - checks-actions
Approved by: epage
Pushing 495d02c to master...

Update cargo 3 commits in 94977cb1fab003d45eb5bb108cb5e2fa0149672a..0d8d22f83b066503f6b2b755925197e959e58b4f 2024-08-06 21:42:10 +0000 to 2024-08-08 12:54:24 +0000 - fix: std Cargo.lock moved to `library` dir (rust-lang/cargo#14370) - fix(vendor): Strip excluded build targets (rust-lang/cargo#14367) - Infer registry (rust-lang/cargo#14340) r? ghost

rustbot assigned ehuss Aug 1, 2024

rustbot added Command-package S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 1, 2024

epage reviewed Aug 1, 2024

View reviewed changes

tests/testsuite/package.rs Outdated Show resolved Hide resolved

epage reviewed Aug 1, 2024

View reviewed changes

src/cargo/ops/cargo_package.rs Outdated Show resolved Hide resolved

jneem force-pushed the infer-registry branch 2 times, most recently from 8402311 to 72411aa Compare August 2, 2024 09:33