Remove the root Cargo.lock from the rust-src component #128685
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
The Cargo.lock in library/ should be used instead. Including the Cargo.lock for the root workspace is both unnecessary and confusing.
|
r? @onur-ozkan rustbot has assigned @onur-ozkan. Use |
rustbot
added
S-waiting-on-review
|
This will break Miri until rustc-build-sysroot is updated to use the new lockfile. |
|
So please let's not land this before rust-lang/miri#3789 propagates to the rustc repo. EDIT: Propagation happening in #128699. |
|
Miri should be ready for this change now. |
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 6, 2024
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#128369 (rustc_lint: make `let-underscore-lock` translatable) - rust-lang#128377 (Fix ICE Caused by Incorrectly Delaying E0107) - rust-lang#128517 (Fallback to string formatting if source is not available for lint) - rust-lang#128685 (Remove the root Cargo.lock from the rust-src component) - rust-lang#128693 (rustdoc-search: account for numeric disambiguators on impls) - rust-lang#128720 (Pass the right `ParamEnv` to `might_permit_raw_init_strict`) - rust-lang#128736 (Fix rustdoc missing handling of remap-path-prefix option) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 7, 2024
Rollup merge of rust-lang#128685 - bjorn3:rust_src_remove_leftover, r=onur-ozkan Remove the root Cargo.lock from the rust-src component The Cargo.lock in library/ should be used instead. Including the Cargo.lock for the root workspace is both unnecessary and confusing. Missed in rust-lang#128534
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.
The Cargo.lock in library/ should be used instead. Including the Cargo.lock for the root workspace is both unnecessary and confusing.
Missed in #128534