dont call wrap in a no-op source_id::with* #14318
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
the
S-waiting-on-review
epage
added a commit
to epage/cargo
that referenced
this pull request
Jul 29, 2024
This is to quickly resolve a test failure from rust-lang#14318
|
I posted #14319 for the test failure. |
epage
reviewed
Jul 29, 2024
epage
approved these changes
Jul 29, 2024
|
#14319 has been merged |
|
@bors r+ |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 31, 2024
Update cargo 5 commits in b5d44db1daf0469b227a6211b987162a39a54730..257b72b8adfb1f2aa9916cefca67285c21666276 2024-07-26 21:27:12 +0000 to 2024-07-30 15:08:27 +0000 - chore: Update toml (rust-lang/cargo#14324) - dont call wrap in a no-op source_id::with* (rust-lang/cargo#14318) - Partial revert of 3085b548ecbd7d29d40c6180609ea3c224bad857 (rust-lang/cargo#14319) - chore(deps): update msrv (rust-lang/cargo#14303) - Fix warnings building tests on Windows (rust-lang/cargo#14315) r? ghost
stupendoussuperpowers
pushed a commit
to stupendoussuperpowers/cargo
that referenced
this pull request
Aug 7, 2024
This is to quickly resolve a test failure from rust-lang#14318
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR try to resolve?
When running resolution in parallel (which my pubgrub tests do but cargo does not) there can be a lot of contention on the lock for constructing new
source_id. When investigating much of this is due towithout_preciseinencodable_package_idincheck_duplicate_pkgs_in_lockfile. There are many ways to solve this, the simplest seems to be to returnselfif the requested modification made no difference.How should we test and review this PR?
All tests still pass and it's an internal re-factor.
In addition running all crates on crates.io through cargoes resolver in parallel on 190 cores went from >20k sec cpu time to ~10k.
Additional information