Skip to content

Rollup of 3 pull requests#158619

Closed
JonathanBrouwer wants to merge 7 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-QZrXvze
Closed

Rollup of 3 pull requests#158619
JonathanBrouwer wants to merge 7 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-QZrXvze

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

theemathas and others added 7 commits June 14, 2026 17:34
ACP: <rust-lang/libs-team#799>
Tracking issue: <rust-lang#157345>

The docs are mostly copied from `Box::as_mut_ptr()`
The previous error message made it sound like stage != 2 was entirely disallowed
under CI. But actually it was only *implicit* stage != 2 which is disallowed -
an explicit `--stage 1` is permitted and is sometimes correct.

Minimal command to trigger the error message: `GITHUB_ACTIONS=true ./x test ui`
lint on `core::ffi::c_void` as a return type

Fixes rust-lang#100972.

This PR introduces a new ~deny-by-default~ warn-by-default lint `c_void_returns` that fires on usage of `core::ffi::c_void` as a return type. This is never correct, and is a potential stumbling block for users coming from C.
…sonn

Implement `Box::as_non_null()`.

ACP: <rust-lang/libs-team#799>
Tracking issue: <rust-lang#157345>

The docs are mostly copied from `Box::as_mut_ptr()`

I also made a drive-by change to add `#[must_use]` to `Box::as_{ptr, mut_ptr}`.

I'm unsure what `#[rustc_never_returns_null_ptr]` and `#[rustc_as_ptr]` do. Should `Box::as_non_null()` be annotated with them?

r? libs-api
…-message, r=clubby789

Fix error message when rejecting implicit stage != 2 in CI

The previous error message made it sound like stage != 2 was entirely disallowed under CI. But actually it was only *implicit* stage != 2 which is disallowed - an explicit `--stage 1` is permitted and is sometimes correct.

Minimal command to trigger the error message: `GITHUB_ACTIONS=true ./x test ui`
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Jun 30, 2026
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jun 30, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

@rust-bors

rust-bors Bot commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 1c26ed9 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 30, 2026
@rust-bors

rust-bors Bot commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

⌛ Testing commit 1c26ed9 with merge a1574a7...

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

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

Rollup of 3 pull requests

Successful merges:

 - #156379 (lint on `core::ffi::c_void` as a return type)
 - #157347 (Implement `Box::as_non_null()`.)
 - #158614 (Fix error message when rejecting implicit stage != 2 in CI)
@jhpratt

jhpratt commented Jun 30, 2026

Copy link
Copy Markdown
Member

@bors treeclosed-

@rust-bors

rust-bors Bot commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

Tree is now open for merging.

@JonathanBrouwer

Copy link
Copy Markdown
Contributor Author

Stuck
"Waiting for a runner to pick up this job..."

@rust-bors rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 30, 2026
@rust-bors

rust-bors Bot commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved due to being closed.

Auto build was cancelled due to the PR being closed. Cancelled workflows:

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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants