Fix a splat legacy demangling display bug by teor2345 · Pull Request #160050 · rust-lang/rust

teor2345 · 2026-07-28T06:25:45Z

Tracking issue: #153629

This PR fixes a splat legacy demangling display bug, where the comma is in the wrong place in the argument list.

It also does a cleanup from @folkertdev's PR #159643 review:

move rustfmt::skip to main() and deduplicate it: Add support for splatted function pointers #159643 (comment)

@rustbot label +F-splat +C-bug +A-name-mangling

Edit: this PR now accepts 8-16 character crate hashes in normalisation regexes, so it no longer depends on rust-lang/rustc-demangle#94 being reviewed, merged, and updated in rustc's deps

Edit 2: this PR only fixes legacy demangling. The v0 splat attribute name is not changed here, because it requires rust-lang/rustc-demangle#93 to be reviewed and merged, a rustc-demangle release, and a version bump in rust-lang/rust to fix. That seems to be better done in another PR.

rustbot · 2026-07-28T06:25:51Z

r? @camelid

rustbot has assigned @camelid.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

Owners of files modified in this PR: compiler
compiler expanded to 74 candidates
Random selection from 19 candidates

teor2345 · 2026-09-04T13:18:49Z

@rustbot ready

I changed this PR to accept 8-16 character crate hashes in normalisation regexes, so it no longer depends on rust-lang/rustc-demangle#94 being reviewed, merged, and updated in rustc's deps. This is consistent with the normalisation approach taken in the UI test framework.

camelid

Sorry for my delay with this. Looks good except for the splat/rustc_splat inconsistency (and the merge conflicts).

View changes since this review

camelid · 2026-09-24T18:33:30Z

+           //[legacy]~| ERROR demangling(splat_mangling::main::Type<*mut fn(u32,i8,#[rustc_splat] (f64,))>::
+           //[legacy]~| ERROR demangling-alt(splat_mangling::main::Type<*mut fn(u32,i8,#[rustc_splat] (f64,))>)
+    //[v0,default]~^^^^ ERROR symbol-name(_RMs6_NvCsCRATE_HASH_14splat_mangling4mainINtB<REF>_4TypeOFmawTdEEuE)
+       //[v0,default]~| ERROR demangling(<splat_mangling[
+       //[v0,default]~| ERROR demangling-alt(<splat_mangling::main::Type<*mut fn(u32, i8, #[splat] (f64,))>>)


Is it intentional that legacy mangling says #[rustc_splat] but v0 says #[splat]? It seems like v0 is wrong.

v0 is not fixed, but also out of scope for this PR. v0 requires rust-lang/rustc-demangle#93 to be reviewed and merged, a rustc-demangle release, and a version bump in rust-lang/rust to fix.

So I think it's best that they're fixed separately.

I'll do a rebase right now.

By accepting 8-16 character crate hashes

rustbot · 2026-09-25T07:01:13Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

teor2345 · 2026-09-25T07:01:41Z

Just a change from ERROR to NOTE on some log lines

@rustbot ready

camelid

Thanks!

View changes since this review

camelid · 2026-10-13T17:24:04Z

@bors r+ rollup

rust-bors · 2026-10-13T17:24:08Z

📌 Commit 2fb58b9 has been approved by camelid

It is now in the queue for this repository.

@folkertdev

…camelid Fix a splat legacy demangling display bug Tracking issue: rust-lang#153629 This PR fixes a splat legacy demangling display bug, where the comma is in the wrong place in the argument list. It also does a cleanup from @folkertdev's PR rust-lang#159643 review: - move rustfmt::skip to main() and deduplicate it: rust-lang#159643 (comment) @rustbot label +F-splat +C-bug +A-name-mangling Edit: this PR now accepts 8-16 character crate hashes in normalisation regexes, so it no longer depends on rust-lang/rustc-demangle#94 being reviewed, merged, and updated in rustc's deps Edit 2: this PR only fixes legacy demangling. The v0 splat attribute name is not changed here, because it requires rust-lang/rustc-demangle#93 to be reviewed and merged, a rustc-demangle release, and a version bump in rust-lang/rust to fix. That seems to be better done in another PR.

…uwer Rollup of 12 pull requests Successful merges: - #164040 (move `BoundVarReplacer` into rustc_type_ir) - #162934 (bootstrap: Let test-float-parse follow --target) - #164269 (convert non-generic diagnostic attribute placeholders to snake_case) - #160050 (Fix a splat legacy demangling display bug) - #163383 (Provide context span pointing at trait/item when talking about assoc items) - #164023 (make `with_post_analysis_normalized` invalidate rigid aliases) - #164041 (Add regression test for dead-code with external trait impl) - #164166 (Ignore thread-related tests for UEFI) - #164229 (Update outdated `hir_attrs` doc) - #164244 (Remove the 'sup' method from 'At' and migrate uses to 'sup_raw') - #164257 (Add transmutability test to cover for superseded PR) - #164263 (Fix expected output for x86-64-sysv64-arg-ext.apple.stderr)

@folkertdev

Rollup merge of #160050 - teor2345:splat-legacy-demangle, r=camelid Fix a splat legacy demangling display bug Tracking issue: #153629 This PR fixes a splat legacy demangling display bug, where the comma is in the wrong place in the argument list. It also does a cleanup from @folkertdev's PR #159643 review: - move rustfmt::skip to main() and deduplicate it: #159643 (comment) @rustbot label +F-splat +C-bug +A-name-mangling Edit: this PR now accepts 8-16 character crate hashes in normalisation regexes, so it no longer depends on rust-lang/rustc-demangle#94 being reviewed, merged, and updated in rustc's deps Edit 2: this PR only fixes legacy demangling. The v0 splat attribute name is not changed here, because it requires rust-lang/rustc-demangle#93 to be reviewed and merged, a rustc-demangle release, and a version bump in rust-lang/rust to fix. That seems to be better done in another PR.

…uwer Rollup of 12 pull requests Successful merges: - rust-lang/rust#164040 (move `BoundVarReplacer` into rustc_type_ir) - rust-lang/rust#162934 (bootstrap: Let test-float-parse follow --target) - rust-lang/rust#164269 (convert non-generic diagnostic attribute placeholders to snake_case) - rust-lang/rust#160050 (Fix a splat legacy demangling display bug) - rust-lang/rust#163383 (Provide context span pointing at trait/item when talking about assoc items) - rust-lang/rust#164023 (make `with_post_analysis_normalized` invalidate rigid aliases) - rust-lang/rust#164041 (Add regression test for dead-code with external trait impl) - rust-lang/rust#164166 (Ignore thread-related tests for UEFI) - rust-lang/rust#164229 (Update outdated `hir_attrs` doc) - rust-lang/rust#164244 (Remove the 'sup' method from 'At' and migrate uses to 'sup_raw') - rust-lang/rust#164257 (Add transmutability test to cover for superseded PR) - rust-lang/rust#164263 (Fix expected output for x86-64-sysv64-arg-ext.apple.stderr)

rustbot assigned camelid Jul 28, 2026

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 28, 2026

rustbot added A-name-mangling Area: Name mangling / decoration aka symbol mangling C-bug Category: This is a bug. F-splat `#![feature(splat)]` https://github.com/rust-lang/rust/issues/153629 labels Jul 28, 2026

camelid requested changes Jul 28, 2026

View reviewed changes

Comment thread compiler/rustc_middle/src/ty/print/pretty.rs Outdated

rustbot 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 Jul 28, 2026

This comment was marked as resolved.

Sign in to view

teor2345 force-pushed the splat-legacy-demangle branch from c82af0a to 980ae5d Compare July 29, 2026 01:15

This comment has been minimized.

Sign in to view

This comment was marked as outdated.

Sign in to view

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 29, 2026

This comment has been minimized.

Sign in to view

teor2345 force-pushed the splat-legacy-demangle branch from 980ae5d to 1099c87 Compare July 29, 2026 05:42

camelid reviewed Jul 29, 2026

View reviewed changes

Comment thread compiler/rustc_middle/src/ty/print/pretty.rs Outdated

Comment thread compiler/rustc_middle/src/ty/print/pretty.rs Outdated

camelid 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 Jul 29, 2026

teor2345 force-pushed the splat-legacy-demangle branch from 1099c87 to 149a65c Compare July 30, 2026 00:52

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 30, 2026

teor2345 force-pushed the splat-legacy-demangle branch from 149a65c to 9f6099c Compare July 31, 2026 03:28

This comment has been minimized.

Sign in to view

teor2345 mentioned this pull request Jul 31, 2026

Rename splat attribute to rustc_splat rust-lang/rustc-demangle#93

Open

teor2345 force-pushed the splat-legacy-demangle branch from 9f6099c to 8db7925 Compare July 31, 2026 04:45

This comment has been minimized.

Sign in to view

teor2345 force-pushed the splat-legacy-demangle branch from 8db7925 to 511d292 Compare July 31, 2026 05:30

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Sep 4, 2026

This comment was marked as resolved.

Sign in to view

camelid requested changes Sep 24, 2026

View reviewed changes

rustbot 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 Sep 24, 2026

teor2345 added 4 commits September 25, 2026 08:47

Refactor pretty print comma_sep flag

e3e4fed

Fix a splat legacy demangling bug, add extra tests

48f1386

Move rustfmt::skip to main in one test

5c8074f

Disentangle from rustc-demangle fix

2fb58b9

By accepting 8-16 character crate hashes

teor2345 force-pushed the splat-legacy-demangle branch from 2a313d7 to 2fb58b9 Compare September 25, 2026 07:01

This comment was marked as resolved.

Sign in to view

teor2345 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 25, 2026

camelid approved these changes Oct 13, 2026

View reviewed changes

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 Oct 13, 2026

This was referenced Oct 13, 2026

Rollup of 13 pull requests #164276

Closed

Rollup of 12 pull requests #164280

Merged

rust-bors Bot merged commit b5ef0dc into rust-lang:main Oct 14, 2026
13 checks passed

rustbot added this to the 1.101.0 milestone Oct 14, 2026

Conversation

teor2345 commented Jul 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jul 28, 2026

Uh oh!

Uh oh!

This comment was marked as resolved.

This comment has been minimized.

This comment was marked as outdated.

This comment has been minimized.

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

teor2345 commented Sep 4, 2026

Uh oh!

This comment was marked as resolved.

camelid left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

camelid Sep 24, 2026

Choose a reason for hiding this comment

Uh oh!

teor2345 Sep 25, 2026

Choose a reason for hiding this comment

Uh oh!

rustbot commented Sep 25, 2026

Uh oh!

teor2345 commented Sep 25, 2026

Uh oh!

This comment was marked as resolved.

camelid left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

camelid commented Oct 13, 2026

Uh oh!

rust-bors Bot commented Oct 13, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

teor2345 commented Jul 28, 2026 •

edited

Loading

camelid left a comment •

edited by rustbot

Loading

camelid left a comment •

edited by rustbot

Loading