Rollup of 8 pull requests - #160207
Closed
JonathanBrouwer wants to merge 23 commits into
Closed
Conversation
`item.rs` is approaching the tidy-enforced length limit, and this will make room for new additions.
fastmod --fixed-strings '#[splat]' '#[rustc_splat]'
fastmod --fixed-strings '`splat` attribute' '`rustc_splat` attribute'
fastmod --fixed-strings '$splat$' '$rustc_splat$'
fastmod 'v0(.*)#\[rustc_splat\]' 'v0${1}#[splat]' tests/ui/splat/splat-mangling.rs
…ieyouxu Rename splat to avoid stable name collisions Tracking issue: rust-lang#153629 This PR renames `#[splat]` to `#[rustc_splat]`, in a mostly automated way (using `fastmod`). The rename commands I used were: ```sh fastmod --fixed-strings '#[splat]' '#[rustc_splat]' fastmod --fixed-strings '`splat` attribute' '`rustc_splat` attribute' # I'm pretty sure the symbol demangling commands are no-ops on beta # Legacy symbol demangling fastmod --fixed-strings '$splat$' '$rustc_splat$' # Revert some changes that aren't in rustc_demangle yet fastmod 'v0(.*)#\[rustc_splat\]' 'v0${1}#[splat]' tests/ui/splat/splat-mangling.rs ``` Part of rust-lang#159428 #### Backport Advice Cherry-pick the first commit to the beta branch, then run the fastmod commands above. I've tested this locally (with a slightly different name), and it works, see my [`splat-rename-beta` branch](https://github.com/teor2345/rust/tree/splat-rename-beta). #### Remaining Work rustc_demangle needs an update to the attribute name, a release, and then a version bump in rust-lang/rust. I'll do that separately. It doesn't need to be backported, because the last version bump was after beta branched. There's also some external code that needs updates, the full list is in the ticket: rust-lang#159428 (comment) @rustbot label +beta-nominated +A-attributes +A-macros +A-resolve +C-bug +F-splat +P-high +T-compiler
…noescape, r=Darksonn Don't escape U+FF9E and U+FF9F in `escape_debug_ext` The two characters `゙` U+FF9E HALFWIDTH KATAKANA VOICED SOUND MARK and `゚` U+FF9F HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK are the odd ones out when it comes to grapheme extenders, in that *graphically* they are not combining at all. See microsoft/terminal#18087 for more background on these characters. I think this needs FCP? It affects `char::escape_debug`, and various `Debug` impls for characters and strings. @rustbot labels T-libs-api needs-fcp A-Unicode
…nyukang Resolve vars before calling `unnormalized_obligations` Fixes rust-lang/rust-clippy#17439
Split function parsing out of `item.rs` to a new module. `item.rs` is approaching the tidy-enforced length limit, and this will make room for new additions. I have split this change out of PR rust-lang#159044 to reduce its complexity (and because this large code move quickly becomes stale).
…yukang Add regression tests for fixed dead-code issues Fixes rust-lang#56750 (fixed by rust-lang#142485) Fixes rust-lang#102190 (fixed by rust-lang#102538) Fixes rust-lang#102217 (fixed by rust-lang#102538) Fixes rust-lang#148861 (fixed by rust-lang#154377)
tests: Remove `-Zthreads` options from tests in `ui/parallel-rustc` The number of threads is now passed by compiletest through `--parallel-frontend-threads=N` in parallel testing runs. If it becomes necessary, we'll be able to set a larger number of threads or iterations for the `ui/parallel-rustc` tests specifically. r? @jieyouxu
Try to recover less from incorrectly parsed const arg The error recovery can cause a cascade of irrelevant errors, so instead return the `PResult::Err` and let the parser fail further up in the logic. Fix rust-lang#88416.
… r=chenyukang Mark `Tuple` and `FnPtr` traits `#[fundamental]` This makes it possible to write certain blanket implementations over these traits that would be impossible otherwise, at the cost of making it a breaking change to add new implementations of these traits for existing types. I doubt we plan to convert existing types into function pointers or tuples, so this seems fine. @rustbot label F-fundamental
Contributor
Author
|
@bors r+ rollup=never p=5 |
Contributor
This comment has been minimized.
This comment has been minimized.
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 30, 2026
…uwer Rollup of 8 pull requests Successful merges: - #159817 (Rename splat to avoid stable name collisions) - #158057 (Don't escape U+FF9E and U+FF9F in `escape_debug_ext`) - #159818 (Resolve vars before calling `unnormalized_obligations`) - #160040 (Split function parsing out of `item.rs` to a new module.) - #160044 (Add regression tests for fixed dead-code issues) - #160147 (tests: Remove `-Zthreads` options from tests in `ui/parallel-rustc`) - #160175 (Try to recover less from incorrectly parsed const arg) - #160181 (Mark `Tuple` and `FnPtr` traits `#[fundamental]`)
Contributor
|
💔 Test for 5b9c68b failed: CI. Failed job:
|
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot)Important For more information how to resolve CI failures of this job, visit this link. |
Member
|
Is this a soft-conflict between #160147 and something else? |
Contributor
|
PR #160147, which is a member of this rollup, was unapproved. |
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
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:
escape_debug_ext#158057 (Don't escape U+FF9E and U+FF9F inescape_debug_ext)unnormalized_obligations#159818 (Resolve vars before callingunnormalized_obligations)item.rsto a new module. #160040 (Split function parsing out ofitem.rsto a new module.)-Zthreadsoptions from tests inui/parallel-rustc#160147 (tests: Remove-Zthreadsoptions from tests inui/parallel-rustc)TupleandFnPtrtraits#[fundamental]#160181 (MarkTupleandFnPtrtraits#[fundamental])r? @ghost
Create a similar rollup