Rollup of 11 pull requests - #160273
Closed
JonathanBrouwer wants to merge 42 commits into
Closed
Conversation
`cfg_select!` parsing needs to be implemented in rustfmt right now because there's no good way to call `rustc_attr_parsing::parse_cfg_select`.
The plan is to leverage `rewrite_match_body` to help with `cfg_select!` formatting.
Apply feedback from PR review.
Per the PR review I'm making `context: &RewriteContext<'_>` the first argument. Also moved the `shape` and `span` to follow the `context`.
Because `inside_macro` is a `Rc<Cell<bool>>` cloning the entire context doesn't actually isolate the `inside_macro` state. However, I've added a `debug_assert!` to make sure that we only ever call `context.leave_macro` when we're on a code path that immediately returns from `rewrite_macro_inner` so that we don't unexpectedly impact default macro handling where we need to be more cautious about adding or removing tokens.
…sages fastmod --extensions rs --fixed-strings 'splat attribute' '`rustc_splat` attribute'
It was hard to read which backport section is for which team.
…l, r=mejrs More accurately check for interior mutability in `invalid_reference_casting` lint This PR replaces the `Freeze` trait check in the `invalid_reference_casting` lint by a recursive type check. The check was not enough to determine if a type has "interior mutability", as `Freeze` is proxy for "has *some* interior mutability", not "fully covered by interior mutability". As requested in rust-lang#159960 (comment)
rustdoc: Fix crash when trying to list attributes on an opaque type Fixes rust-lang#160107. It's crashing because we're using `get_attrs` on an `OpaqueTy` which cannot have attributes and therefore crashed. So instead, I check ahead of calling this function in the path where this can happen instead of doing it in `convert_render_type_id` on all `RenderTypeId::DefId`. r? @notriddle
…eyouxu Rename splat to rustc_splat in error messages Tracking issue: rust-lang#153629 This PR renames "splat attribute" to "\`rustc_splat\` attribute" in error messages (and some comments). It was meant to be part of rust-lang#159817 but I missed it. The search and replace command I used was: ```sh fastmod --extensions rs --fixed-strings 'splat attribute' '`rustc_splat` attribute' ``` This doesn't need to be backported, because those error messages only appear on nightly. Part of rust-lang#159428
Configure backport nominations for rustfmt ## Summary As discussed in [#t-rustfmt > Backport channel](https://rust-lang.zulipchat.com/#narrow/channel/357797-t-rustfmt/topic/Backport.20channel/with/613788070), configure triagebot backport nominations (rust-lang/rust) against [#t-rustfmt/backports](https://rust-lang.zulipchat.com/#narrow/channel/621384-t-rustfmt.2Fbackports) so it's less likely for backport nominations involving rustfmt to get lost. The rustfmt backport channel number is `621384`, since the URL is ``` https://rust-lang.zulipchat.com/#narrow/channel/621384-t-rustfmt.2Fbackports ``` cc @ytmimi
rustbot
added
A-attributes
Contributor
Author
Contributor
rust-bors
Bot
added
S-waiting-on-bors
Contributor
|
⌛ Trying commit e14f53a with merge 5384dce… To cancel the try build, run the command Workflow: https://github.com/rust-lang/rust/actions/runs/30621845262 |
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 31, 2026
Rollup of 11 pull requests try-job: dist-various-1 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 try-job: i686-msvc-*
Contributor
Author
|
@bors try cancel |
rust-bors
Bot
added
S-waiting-on-author
Contributor
|
This pull request was unapproved due to being closed. |
Contributor
|
Try build cancelled. Cancelled workflows: |
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
13 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.
Successful merges:
cfg_select!#154202 (rustfmt: Formatcfg_select!)rustc_on_unimplementedattributes and lint malformed filters #160113 (Coalescerustc_on_unimplementedattributes and lint malformed filters)coroutine_hidden_typesfor the next solver #160119 (fix query cycle incoroutine_hidden_typesfor the next solver)-Zthreadsoptions from tests inui/parallel-rustc#160147 (tests: Remove-Zthreadsoptions from tests inui/parallel-rustc)invalid_reference_castinglint #160159 (More accurately check for interior mutability ininvalid_reference_castinglint)r? @ghost
Create a similar rollup