Skip to content

[beta] backports - #160714

Open
cuviper wants to merge 10 commits into
rust-lang:betafrom
cuviper:beta-next
Open

[beta] backports#160714
cuviper wants to merge 10 commits into
rust-lang:betafrom
cuviper:beta-next

Conversation

@cuviper

@cuviper cuviper commented Aug 7, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Member

r? me

mkroening and others added 3 commits August 4, 2026 16:03
@mkroening @cuviper
rustfmt: Discover modules via cfg_select!
f8beb1e 
(cherry picked from commit facc787)
@teor2345 @cuviper
Rename splat attribute to rustc_splat
2c57aef 
(cherry picked from commit cb797b8)
@teor2345 @cuviper
Automatically rename rustc_splat attribute
32d9aa0 
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

(cherry picked from commit e574edf)
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustfmt Relevant to the rustfmt team, which will review and decide on the PR/issue. labels Aug 7, 2026
@rust-log-analyzer

This comment has been minimized.

Sign in to view
teor2345 and others added 6 commits August 7, 2026 10:24
@teor2345 @cuviper
Appease tidy after auto rename
bb3726b 
(cherry picked from commit bc1bb27)
@jieyouxu @cuviper
Rename #[unroll] => #[rustc_unroll] to mitigate nameres ambiguity
cad2ee2 
Mitigation for [RUST-159429].

The recurring problem is that built-in attributes are treated
differently compared to ordinary prelude attributes, built-in
attributes, even while unstable, can name-collide with stable macro
re-exports of the same name (and proc-macro helper attributes of the
same name), which can break stable code. See [RUST-134964].

[RUST-159429]: rust-lang#159429
[RUST-134963]: rust-lang#134963

(cherry picked from commit 0a0f6df)
@jieyouxu @cuviper
Update attr name in #[unroll] codegen-llvm tests
5283510 
(cherry picked from commit 44d291e)
@jieyouxu @cuviper
Update attr name in #[unroll] ui tests
b01bcda 
To account for the renamed `#[rustc_unroll]` attribute.

(cherry picked from commit 91ee1f3)
@jieyouxu @cuviper
Rebless rustc-attrs feature gate test
e8fc18f 
This stderr diff is a funny side-effect of renaming `#[unroll]` =>
`#[rustc_unroll]`, where the `#[rustc_unknown]` attribute name is just
similar enough edit distance wise to `#[rustc_unroll]` that
`#[rustc_unroll]` shows up as a plausible suggestion candidate, lol.

(cherry picked from commit 945d2f3)
@jieyouxu @cuviper
Update attr name for #[unroll] in Unstable Book
33c0be1 
(cherry picked from commit d1265b7)
@rustbot

rustbot commented Aug 7, 2026

Copy link
Copy Markdown
Collaborator

⚠️ Warning ⚠️

@cuviper

cuviper commented Aug 7, 2026

Copy link
Copy Markdown
Member Author

@bors r+ rollup=never p=1

@rust-bors

rust-bors Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

📌 Commit ebcacaa has been approved by cuviper

It is now in the queue for this repository.

@rust-bors rust-bors Bot added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 7, 2026
@cuviper cuviper mentioned this pull request Aug 7, 2026
Open
@rust-bors rust-bors Bot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 7, 2026
@rust-bors

This comment has been minimized.

Sign in to view
rust-bors Bot pushed a commit that referenced this pull request Aug 7, 2026
@bors
Auto merge of #160714 - cuviper:beta-next, r=cuviper
8ba9fdd 
[beta] backports

- rustfmt: Discover modules via `cfg_select!` #158372
- Rename splat to avoid stable name collisions #159817
- Rename `#[unroll]` => `#[rustc_unroll]` to mitigate nameres ambiguity #160211
- [beta-1.98] Update cargo submodule #160596

r? me
@rust-log-analyzer

rust-log-analyzer commented Aug 7, 2026

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web) (plain enhanced) (plain)

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

@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 Aug 7, 2026
@rust-bors

rust-bors Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 8ba9fdd failed: CI. Failed job:

@JonathanBrouwer

JonathanBrouwer commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

Ah right this problem, there was a pr some time ago to fix this by mirroring the artifacts, we should cherry pick that pr
(I'll look for it tomorrow if nobody else does it before me)

@cuviper

cuviper commented Aug 8, 2026

Copy link
Copy Markdown
Member Author

Hmm, if you mean #158774, beta already has that.

I also found mirror changes in #158802 and #158734 which aren't on beta, although those don't touch the target that failed here. They might still be needed though? (obviously not the whole LLVM upgrade)

The problem file in the log is ncurses-6.5.tar.gz, which got a different sha256 on each retry...

@JonathanBrouwer

JonathanBrouwer commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

Hmmm I indeed meant #158774...

@jieyouxu

jieyouxu commented Aug 8, 2026

Copy link
Copy Markdown
Member

Those are not going to help for ncurses, we need to mirror ncurses artifacts separately.

@JonathanBrouwer

JonathanBrouwer commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

I wanted to start mirroring the artifacts but I cannot reproduce it locally by running ./run.sh dist-powerpc64-linux-musl
Does this happen to have fixed itself? We should still mirror these artifacts regardless tho
@bors try jobs=dist-powerpc64-linux-musl

@rust-bors

This comment has been minimized.

Sign in to view
rust-bors Bot pushed a commit that referenced this pull request Aug 8, 2026
@bors
Auto merge of #160714 - cuviper:beta-next, r=<try>
e413c56 
[beta] backports


try-job: dist-powerpc64-linux-musl
@rust-bors

rust-bors Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: e413c56 (e413c5649592790baaf082c73c5c8a2383f6620f)
Base parent: 0c45ca3 (0c45ca314d60447c808f437c9df49ac81c0dc23d)

@JonathanBrouwer

JonathanBrouwer commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

@bors retry

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

Reviewers

No reviews

Assignees

@cuviper cuviper

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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-rustfmt Relevant to the rustfmt team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@cuviper @rust-log-analyzer @rustbot @JonathanBrouwer @jieyouxu @mkroening @teor2345 @weihanglo