[beta-1.93] Backport locking fixes#16386
Merged
weihanglo merged 4 commits intorust-lang:rust-1.93.0from Dec 12, 2025
Merged
Conversation
Changed accordingly to rust-lang/rust#149400
```
error: this assertion has a constant value
--> crates/build-rs-test-lib/src/lib.rs:3:5
|
3 | assert!(cfg!(did_run_build_script));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: consider moving this into a const block: `const { assert!(..) }`
= help: for further information visit https://rust-lang.github.io/rust-clippy/rust-1.92.0/index.html#assertions_on_constants
= note: `-D clippy::assertions-on-constants` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::assertions_on_constants)]`
```
A bit annoying we can't have `lint.workspace = true` for this crate yet
rustbot
added
A-build-scripts
Collaborator
|
weihanglo
changed the title
weihanglo
approved these changes
Dec 12, 2025
rustbot
removed
the
S-waiting-on-review
bors
added a commit
to rust-lang/rust
that referenced
this pull request
Dec 16, 2025
[beta-1.93] Backport Cargo bug fix for 1.93 2 commits in 2c283a9a5c5968eeb9a8f12313f04feb1ff8dfac..083ac5135f967fd9dc906ab057a2315861c7a80d 2025-12-04 16:47:28 +0000 to 2025-12-11 23:19:46 -0500 - [beta-1.93] Backport locking fixes (rust-lang/cargo#16386) - [beta-1.93] Downgrade curl-sys to 0.4.83 (rust-lang/cargo/pull/16399)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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?
This PR backports #16385 along with some test fixes from #16380 to make CI happy.
How to test and review this PR?
r? @weihanglo