Skip to content

Rollup of 5 pull requests - #154588

Closed
JonathanBrouwer wants to merge 58 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-BYI2Oee
Closed

Rollup of 5 pull requests#154588
JonathanBrouwer wants to merge 58 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-BYI2Oee

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

devnexen and others added 30 commits March 21, 2026 11:30
The `_umtx_time` flags check in `read_umtx_time` used equality (`flags == abs_time`) instead of bitwise AND (`flags & abs_time != 0`) to detect `UMTX_ABSTIME`. While functionally equivalent for current valid inputs (0 or `UMTX_ABSTIME` alone), the equality check would silently treat an absolute timeout as relative if `flags` had `UMTX_ABSTIME` set alongside other bits. Additionally, unknown flags were silently accepted, whereas the FreeBSD kernel (`umtx_copyin_umtx_time()` in `kern_umtx.c`) rejects them with `EINVAL`.

The fix adds validation that rejects unsupported flags and switches to the standard bitwise AND pattern used elsewhere in the codebase (e.g. `O_APPEND`/`O_TRUNC` checks in `fs.rs`).
…threads

Unblock all threads with exceeded timeouts at once
This updates the rust-version file to 212b0d4.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 212b0d4
Filtered ref: e8897faa70ed30070b7637e854418aa7aa5ea0d9
Upstream diff: rust-lang/rust@fd0c901...212b0d4

This merge was created using https://github.com/rust-lang/josh-sync.
CONTRIBUTING: explain how to build miri against a locally built rustc
test miri_start with and without std
This updates the rust-version file to 8a70352.
./miri toolchain: support overwriting the to-be-installed commit
This updates the rust-version file to 1174f78.
test with cargo's new build-dir layout
@rust-bors rust-bors Bot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 30, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Mar 30, 2026
Rollup of 5 pull requests


try-job: test-various
try-job: x86_64-gnu-aux
try-job: x86_64-gnu-llvm-21-3
try-job: x86_64-msvc-1
try-job: aarch64-apple
try-job: x86_64-mingw-1
@rust-bors

rust-bors Bot commented Mar 30, 2026

Copy link
Copy Markdown
Contributor

⌛ Testing commit 978bb83 with merge 8d8ff2b...

Workflow: https://github.com/rust-lang/rust/actions/runs/23749173736

rust-bors Bot pushed a commit that referenced this pull request Mar 30, 2026
…uwer

Rollup of 5 pull requests

Successful merges:

 - #154582 (miri subtree update)
 - #154270 (Create `Ty` type alias in `rustc_type_ir`)
 - #154574 (delete several `ui/consts` tests)
 - #154577 (Update `mir-opt` 64-bit panic-abort tests for `Alignment` rename)
 - #154579 (remove debug requirement from hooks)
@rust-bors

rust-bors Bot commented Mar 30, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 2940282 (2940282da596f208abf6baf4d40cbdfb11d55245, parent: 4cf5f9580233c36f6bc8db76e282ba8a1c1ea491)

@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors retry
Stuck

@rust-bors

rust-bors Bot commented Mar 30, 2026

Copy link
Copy Markdown
Contributor

❗ You can only retry pull requests that are approved and have a previously failed auto build.

Hint: There is currently a pending auto build on this PR. To cancel it, run @bors cancel.

@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors yield

@rust-bors

rust-bors Bot commented Mar 30, 2026

Copy link
Copy Markdown
Contributor

Auto build was cancelled. Cancelled workflows:

The next pull request likely to be tested is #154588.

@rust-bors

rust-bors Bot commented Mar 30, 2026

Copy link
Copy Markdown
Contributor

⌛ Testing commit 978bb83 with merge 26623c8...

Workflow: https://github.com/rust-lang/rust/actions/runs/23762240760

rust-bors Bot pushed a commit that referenced this pull request Mar 30, 2026
…uwer

Rollup of 5 pull requests

Successful merges:

 - #154582 (miri subtree update)
 - #154270 (Create `Ty` type alias in `rustc_type_ir`)
 - #154574 (delete several `ui/consts` tests)
 - #154577 (Update `mir-opt` 64-bit panic-abort tests for `Alignment` rename)
 - #154579 (remove debug requirement from hooks)
@rust-bors rust-bors Bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 31, 2026
@rust-bors

rust-bors Bot commented Mar 31, 2026

Copy link
Copy Markdown
Contributor

💥 Test timed out after 21600s

@tgross35

Copy link
Copy Markdown
Member

Something spurious?

@bors try jobs=dist-x86_64-linux

@rust-bors

rust-bors Bot commented Mar 31, 2026

Copy link
Copy Markdown
Contributor

⌛ Trying commit 978bb83 with merge b7b0197

To cancel the try build, run the command @bors try cancel.

Workflow: https://github.com/rust-lang/rust/actions/runs/23775846621

rust-bors Bot pushed a commit that referenced this pull request Mar 31, 2026
Rollup of 5 pull requests


try-job: dist-x86_64-linux
This was referenced Mar 31, 2026
@rust-bors rust-bors Bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 31, 2026
@rust-bors

rust-bors Bot commented Mar 31, 2026

Copy link
Copy Markdown
Contributor

PR #154582, which is a member of this rollup, was unapproved.

@rust-bors rust-bors Bot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 31, 2026
@JonathanBrouwer

JonathanBrouwer commented Mar 31, 2026

Copy link
Copy Markdown
Member Author

The first hang was on the x86_64-gnu-aux job, dist-x86_64-linux finished there, so probably spurious and just very unlucky?

@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 31, 2026
@rust-bors

rust-bors Bot commented Mar 31, 2026

Copy link
Copy Markdown
Contributor

💥 Test timed out after 21600s

@rust-bors rust-bors Bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 31, 2026
@JonathanBrouwer
JonathanBrouwer deleted the rollup-BYI2Oee branch August 21, 2026 08:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.