Skip to content

Rollup of 3 pull requests#156108

Closed
JonathanBrouwer wants to merge 14 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-6CsQVxv
Closed

Rollup of 3 pull requests#156108
JonathanBrouwer wants to merge 14 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-6CsQVxv

Conversation

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

@JonathanBrouwer JonathanBrouwer commented May 3, 2026

Successful merges:

r? @ghost

Create a similar rollup

GuillaumeGomez and others added 14 commits May 2, 2026 18:08
@GuillaumeGomez
Fix doc_cfg feature on reexports
d4997ca
@GuillaumeGomez
Better use of conditions in propagate_doc_cfg
6f644d8
@GuillaumeGomez
Keep the original import DefId when inlining items through multiple…
ba27564 
… reexports
@oli-obk
Stop using rustc_scalar_layout attr in gvn test
8290841
@oli-obk
Stop using rustc_scalar_layout attr in jump threading test
25d0328
@oli-obk
Stop using rustc_scalar_layout in enum test
df112cf
@oli-obk
Remove mir-opt mention of rustc_scalar_layout attr
e397ac2
@oli-obk
Remove rustc_layout_scalar_valid_range attr from debuginfo
8882bf0
@oli-obk
Rip out rustc_layout_scalar_valid_range_* attribute support
11d88ee
@oli-obk
Remove const closure hacks in libstd
33a54dd
@oli-obk
Revert const hack and use const closure
c9725eb
@JonathanBrouwer
Rollup merge of rust-lang#156073 - GuillaumeGomez:doc-cfg-reexports, …
47f3aa6 
…r=Urgau

[rustdoc] Fix `doc_cfg` feature on reexports

Part of rust-lang#150268.

I don't mark the issue as fixed as I need to check the third case described in the issue. First commit comes from rust-lang#156020, will need to rebase this PR once the original is merged.

r? @Urgau
@JonathanBrouwer
Rollup merge of rust-lang#155433 - oli-obk:bye-bye-long-attribute, r=…
267dfb4 
…RalfJung,ShoyuVanilla

Rip out rustc_layout_scalar_valid_range_* attribute support

And either removes tests for it or replaces the uses with pattern types.

primarily fixes rust-lang#135996

fixes rust-lang#147761
fixes rust-lang#133652
@JonathanBrouwer
Rollup merge of rust-lang#155957 - oli-obk:const-closure-std, r=jhpratt
396f7ed 
Revert const hacks and use const closures in std

This revealed some smaller bugs in stability checking that I fixed where needed:

* const closures use the const stability of their parent
* trait method default bodies use the const stability of their trait

Otherwise trivial reverts of the const hacks that were added

fixes rust-lang#155781
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label May 3, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-rustc-dev-guide Area: rustc-dev-guide S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-clippy Relevant to the Clippy team. 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels May 3, 2026
@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

JonathanBrouwer commented May 3, 2026

@bors r+ rollup=never p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 3, 2026

📌 Commit 396f7ed 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 May 3, 2026
@rust-bors

This comment has been minimized.

Sign in to view
rust-bors Bot pushed a commit that referenced this pull request May 3, 2026
@bors
Auto merge of #156108 - JonathanBrouwer:rollup-6CsQVxv, r=JonathanBro…
2165d90 
…uwer

Rollup of 3 pull requests

Successful merges:

 - #156073 ([rustdoc] Fix `doc_cfg` feature on reexports)
 - #155433 (Rip out rustc_layout_scalar_valid_range_* attribute support)
 - #155957 (Revert const hacks and use const closures in std)
@rust-log-analyzer
Copy link
Copy Markdown
Collaborator

rust-log-analyzer commented May 3, 2026

The job dist-i586-gnu-i586-i686-musl failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
failures:

---- [ui] tests/ui/iterators/iter-count-overflow-debug.rs stdout ----

error: test did not exit with success! code=Some(101) so test would pass with `run-fail`
status: exit status: 101
command: cd "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/iterators/iter-count-overflow-debug" && RUSTC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" RUST_TEST_THREADS="4" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/iterators/iter-count-overflow-debug/a"
stdout: none
--- stderr -------------------------------

@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 May 3, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 3, 2026

💔 Test for 2165d90 failed: CI. Failed job:

@JonathanBrouwer JonathanBrouwer mentioned this pull request May 3, 2026
Open
@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-review Status: Awaiting review from the assignee but also interested parties. labels May 3, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 3, 2026

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

@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 May 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-rustc-dev-guide Area: rustc-dev-guide rollup A PR which is a rollup T-clippy Relevant to the Clippy team. 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@JonathanBrouwer @rust-log-analyzer @rustbot @GuillaumeGomez @oli-obk