fix(package): Allow packaging of self-cycles with -Zpackage-workspace #15626

epage · 2025-06-04T01:03:56Z

What does this PR try to resolve?

Found this as I was preparing for stabilization.

As we create a graph of packages to ensure publish order, a self-cycle shouldn't matter, so we can skip tracking it.

How to test and review this PR?

rustbot · 2025-06-04T01:04:01Z

rustbot has assigned @weihanglo.
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

weihanglo · 2025-06-04T03:44:24Z

tests/testsuite/package.rs

+        .masquerade_as_nightly_cargo(&["package-workspace"])
+        .with_status(101)
+        .with_stderr_data(str![[r#"
+[ERROR] crates-io is replaced with remote registry dummy-registry;


This error looks pretty weird. What is the actual error?

I cannot reproduce this error with cargo 1.89.0-nightly (64a124607 2025-05-30) outside cargo-test-support (not setting CARGO_HOME).

You need to replace crates.io

Yeah I know, but is there a real world repro?

weihanglo

There is no blocker and the fix seems reasonable. Thank you!

weihanglo · 2025-06-04T12:19:09Z

src/cargo/ops/cargo_package/mod.rs

@@ -417,6 +417,11 @@ fn local_deps<T>(packages: impl Iterator<Item = (Package, T)>) -> LocalDependenc
                continue;
            };

+            // We don't care about cycles
+            if dep.source_id() == pkg.package_id().source_id() {


It is a bit unintuitive, as comparing source_id doesn't generally imply they are cyclic. However, given we filtered in local packages earlier (which source ID contains path to package root as the unique identifer), it makes sense.

Yeah, in general this code assumes that the source_id is unique and looks up a package id by the source id. I could move this into the following if so we can then compare package ids. That won't make a practical differende but maybe it makes the intent clearer?

Update cargo 18 commits in 64a12460708cf146e16cc61f28aba5dc2463bbb4..fc1518ef02b77327d70d4026b95ea719dd9b8c51 2025-05-30 18:25:08 +0000 to 2025-06-06 04:49:44 +0000 - fix: Make UI tests handle hyperlinks consistently (rust-lang/cargo#15640) - Update "time out" to "timeout" (rust-lang/cargo#15637) - fix(workspace): reload current manifest path member only (rust-lang/cargo#15633) - Update dependencies (rust-lang/cargo#15635) - fix(publish): Don't tell people to ctrl-c without knowing consequences (rust-lang/cargo#15632) - refactor: clean up `clippy::perf` lint warnings (rust-lang/cargo#15631) - fix(package): Skip registry check if its not needed (rust-lang/cargo#15629) - Add --offline for comp (rust-lang/cargo#15623) - cargo-credential-libsecret: load libsecret only once (rust-lang/cargo#15295) - test(publish): Improvements in prep for `-Zpackage-workspace` stabilization (rust-lang/cargo#15628) - fix(package): Allow packaging of self-cycles with -Zpackage-workspace (rust-lang/cargo#15626) - docs: clarify `--all-features` not available for all commmands (rust-lang/cargo#15572) - Remove double reference in Shell::print_json (rust-lang/cargo#15460) - fix(trim-paths): remap all paths to `build.build-dir` (rust-lang/cargo#15614) - test(trim-paths): enable more tests for windows-msvc (rust-lang/cargo#15621) - fix(fingerprint): explicit reason rather than "stale; unknown reason" (rust-lang/cargo#15617) - Fix cargo add overwriting symlinked Cargo.toml files (rust-lang/cargo#15281) - chore(deps): update alpine docker tag to v3.22 (rust-lang/cargo#15616) r? ghost

Update cargo 18 commits in 64a12460708cf146e16cc61f28aba5dc2463bbb4..fc1518ef02b77327d70d4026b95ea719dd9b8c51 2025-05-30 18:25:08 +0000 to 2025-06-06 04:49:44 +0000 - fix: Make UI tests handle hyperlinks consistently (rust-lang/cargo#15640) - Update "time out" to "timeout" (rust-lang/cargo#15637) - fix(workspace): reload current manifest path member only (rust-lang/cargo#15633) - Update dependencies (rust-lang/cargo#15635) - fix(publish): Don't tell people to ctrl-c without knowing consequences (rust-lang/cargo#15632) - refactor: clean up `clippy::perf` lint warnings (rust-lang/cargo#15631) - fix(package): Skip registry check if its not needed (rust-lang/cargo#15629) - Add --offline for comp (rust-lang/cargo#15623) - cargo-credential-libsecret: load libsecret only once (rust-lang/cargo#15295) - test(publish): Improvements in prep for `-Zpackage-workspace` stabilization (rust-lang/cargo#15628) - fix(package): Allow packaging of self-cycles with -Zpackage-workspace (rust-lang/cargo#15626) - docs: clarify `--all-features` not available for all commmands (rust-lang/cargo#15572) - Remove double reference in Shell::print_json (rust-lang/cargo#15460) - fix(trim-paths): remap all paths to `build.build-dir` (rust-lang/cargo#15614) - test(trim-paths): enable more tests for windows-msvc (rust-lang/cargo#15621) - fix(fingerprint): explicit reason rather than "stale; unknown reason" (rust-lang/cargo#15617) - Fix cargo add overwriting symlinked Cargo.toml files (rust-lang/cargo#15281) - chore(deps): update alpine docker tag to v3.22 (rust-lang/cargo#15616) r? ghost try-job: test-various

Update cargo 18 commits in 64a12460708cf146e16cc61f28aba5dc2463bbb4..fc1518ef02b77327d70d4026b95ea719dd9b8c51 2025-05-30 18:25:08 +0000 to 2025-06-06 04:49:44 +0000 - fix: Make UI tests handle hyperlinks consistently (rust-lang/cargo#15640) - Update "time out" to "timeout" (rust-lang/cargo#15637) - fix(workspace): reload current manifest path member only (rust-lang/cargo#15633) - Update dependencies (rust-lang/cargo#15635) - fix(publish): Don't tell people to ctrl-c without knowing consequences (rust-lang/cargo#15632) - refactor: clean up `clippy::perf` lint warnings (rust-lang/cargo#15631) - fix(package): Skip registry check if its not needed (rust-lang/cargo#15629) - Add --offline for comp (rust-lang/cargo#15623) - cargo-credential-libsecret: load libsecret only once (rust-lang/cargo#15295) - test(publish): Improvements in prep for `-Zpackage-workspace` stabilization (rust-lang/cargo#15628) - fix(package): Allow packaging of self-cycles with -Zpackage-workspace (rust-lang/cargo#15626) - docs: clarify `--all-features` not available for all commmands (rust-lang/cargo#15572) - Remove double reference in Shell::print_json (rust-lang/cargo#15460) - fix(trim-paths): remap all paths to `build.build-dir` (rust-lang/cargo#15614) - test(trim-paths): enable more tests for windows-msvc (rust-lang/cargo#15621) - fix(fingerprint): explicit reason rather than "stale; unknown reason" (rust-lang/cargo#15617) - Fix cargo add overwriting symlinked Cargo.toml files (rust-lang/cargo#15281) - chore(deps): update alpine docker tag to v3.22 (rust-lang/cargo#15616) r? ghost

epage added 2 commits June 3, 2025 19:58

test(package): Show nightly self-dep behavior

27c39b6

fix(package): Allow packaging of self-cycles with -Zpackage-workspace

876c9fb

rustbot assigned weihanglo Jun 4, 2025

rustbot added Command-package S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 4, 2025

weihanglo reviewed Jun 4, 2025

View reviewed changes

weihanglo approved these changes Jun 4, 2025

View reviewed changes

weihanglo added this pull request to the merge queue Jun 4, 2025

github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Jun 4, 2025

epage added this pull request to the merge queue Jun 4, 2025

Merged via the queue into rust-lang:master with commit 8a9d8bd Jun 4, 2025
24 checks passed

epage deleted the package-self branch June 4, 2025 13:57

weihanglo mentioned this pull request Jun 6, 2025

Update cargo rust-lang/rust#142109

Merged

rustbot added this to the 1.89.0 milestone Jun 10, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix(package): Allow packaging of self-cycles with -Zpackage-workspace #15626

fix(package): Allow packaging of self-cycles with -Zpackage-workspace #15626

Uh oh!

epage commented Jun 4, 2025

Uh oh!

rustbot commented Jun 4, 2025

Uh oh!

Uh oh!

weihanglo Jun 4, 2025

Uh oh!

weihanglo Jun 4, 2025

Uh oh!

epage Jun 4, 2025

Uh oh!

weihanglo Jun 4, 2025

Uh oh!

weihanglo left a comment

Uh oh!

weihanglo Jun 4, 2025 •

edited

Loading

Uh oh!

epage Jun 4, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fix(package): Allow packaging of self-cycles with -Zpackage-workspace #15626

fix(package): Allow packaging of self-cycles with -Zpackage-workspace #15626

Uh oh!

Conversation

epage commented Jun 4, 2025

What does this PR try to resolve?

How to test and review this PR?

Uh oh!

rustbot commented Jun 4, 2025

Uh oh!

Uh oh!

weihanglo Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

weihanglo Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

epage Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

weihanglo Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

weihanglo left a comment

Choose a reason for hiding this comment

Uh oh!

weihanglo Jun 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

epage Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

weihanglo Jun 4, 2025 •

edited

Loading