Skip to content

[beta] backports - #160714

Merged
rust-bors[bot] merged 10 commits into
rust-lang:betafrom
cuviper:beta-next
Aug 9, 2026
Merged

[beta] backports#160714
rust-bors[bot] merged 10 commits into
rust-lang:betafrom
cuviper:beta-next

Conversation

@cuviper

@cuviper cuviper commented Aug 7, 2026

Copy link
Copy Markdown
Member

View all comments

r? me

mkroening and others added 3 commits August 4, 2026 16:03
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.

teor2345 and others added 6 commits August 7, 2026 10:24
(cherry picked from commit bc1bb27)
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)
To account for the renamed `#[rustc_unroll]` attribute.

(cherry picked from commit 91ee1f3)
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)
@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
@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.

rust-bors Bot pushed a commit that referenced this pull request Aug 7, 2026
[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

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:

@rust-bors rust-bors Bot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 8, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Aug 9, 2026
[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

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)
[01:22] / 
[EXTRA]    Verifying SHA256 checksum for 'ncurses-6.5.tar.gz'
#18 82.55 
[01:22] / 
[ERROR]    Bad sha256 digest for ncurses-6.5.tar.gz: 8c8c19abf9a1c325bccf4e9d9d520dfa4d54f590566e04aebc09382fbd4713b9, expect 136d91bc269a9a5785e5f9e980bc76ab57428f604ce3e5a5a90cebc767971cc6
#18 82.55 
[01:22] / 
[ERROR]    Digest verification failed; removing the download
#18 82.55 
[01:22] / 

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

rust-bors Bot commented Aug 9, 2026

Copy link
Copy Markdown
Contributor

💔 Test for cda58a0 failed: CI. Failed job:

@jieyouxu

jieyouxu commented Aug 9, 2026

Copy link
Copy Markdown
Member

Bad sha256 digest for ncurses-6.5.tar.gz: 7a98c4ac3ea276a8da4500556171b6dee8ad4f0d30b211f1b79c42a23f628006, expect 136d91bc269a9a5785e5f9e980bc76ab57428f604ce3e5a5a90cebc767971cc6

I'll mirror ncurses, then this backport can cherry pick that PR, actually, since it's CT-NG looking in ci-mirrors there's no r-l/r side changes needed.

@theemathas

Copy link
Copy Markdown
Contributor

Why does the ncurses download give different SHA256 values each time?

In https://triage.rust-lang.org/gha-logs/rust-lang/rust/93177803816, it's 7a98c4ac3ea276a8da4500556171b6dee8ad4f0d30b211f1b79c42a23f628006

In https://triage.rust-lang.org/gha-logs/rust-lang/rust/93013015396, it's 8c5780bef692c331729f257866b0dd1ed4681fc4b2b65993c4c9a5099b2e8054

@jieyouxu

jieyouxu commented Aug 9, 2026

Copy link
Copy Markdown
Member

CT-NG 1.28.0 ncurses 6.5 known good hashes:

https://github.com/crosstool-ng/crosstool-ng/blob/d427a7ca41690f9d50c04049df6b9b1fe35810d7/packages/ncurses/6.5/chksum#L1-L4

md5 ncurses-6.5.tar.gz ac2d2629296f04c8537ca706b6977687
sha1 ncurses-6.5.tar.gz cde3024ac3f9ef21eaed6f001476ea8fffcaa381
sha256 ncurses-6.5.tar.gz 136d91bc269a9a5785e5f9e980bc76ab57428f604ce3e5a5a90cebc767971cc6
sha512 ncurses-6.5.tar.gz fc5a13409d2a530a1325776dcce3a99127ddc2c03999cfeb0065d0eee2d68456274fb1c7b3cc99c1937bc657d0e7fca97016e147f93c7821b5a4a6837db821e8

Very strange. Checking GNU ncurses 6.5 (https://ftp.gnu.org/gnu/ncurses/), SHA256 is indeed

136d91bc269a9a5785e5f9e980bc76ab57428f604ce3e5a5a90cebc767971cc6

@jieyouxu

jieyouxu commented Aug 9, 2026

Copy link
Copy Markdown
Member

Why does the ncurses download give different SHA256 values each time?

Perhaps two different ncurses are being looked for? These come from two different dist jobs. No, it's both ncurses 6.5. It might be somehow coming from two different external mirrors...? Unless the GNU mirror is... returning slightly different artifacts non-deterministically?!

@jieyouxu

jieyouxu commented Aug 9, 2026

Copy link
Copy Markdown
Member

ci-mirrors PR: rust-lang/ci-mirrors#54

@jieyouxu

jieyouxu commented Aug 9, 2026

Copy link
Copy Markdown
Member

Let's try again...
@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 9, 2026
@jieyouxu

jieyouxu commented Aug 9, 2026

Copy link
Copy Markdown
Member

@bors try jobs=dist-powerpc64-linux-musl,dist-loongarch64-linux

@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Aug 9, 2026
[beta] backports


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

This comment has been minimized.

@rust-bors

rust-bors Bot commented Aug 9, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 5fe2984 (5fe29844001a77d2b776fd572f4b36d84670745f)
Base parent: 0c45ca3 (0c45ca314d60447c808f437c9df49ac81c0dc23d)

@theemathas

Copy link
Copy Markdown
Contributor

@bors r=cuviper rollup=never p=1

@rust-bors

rust-bors Bot commented Aug 9, 2026

Copy link
Copy Markdown
Contributor

📌 Commit ebcacaa has been approved by cuviper

It is now in the queue for this repository.

@JonathanBrouwer

Copy link
Copy Markdown
Contributor

aarch64-apple is being slow but looks likely to still finish

@rust-bors rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 9, 2026
@rust-bors

rust-bors Bot commented Aug 9, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: cuviper
Duration: 5h 24m 26s
Pushing e1114a1 to beta...

@rust-bors
rust-bors Bot merged commit e1114a1 into rust-lang:beta Aug 9, 2026
15 checks passed
@rustbot rustbot added this to the 1.98.0 milestone Aug 9, 2026
@cuviper

cuviper commented Aug 9, 2026

Copy link
Copy Markdown
Member Author

returning slightly different artifacts non-deterministically?!

I wonder if it's not really hashing a tarball at all, but rather an HTTP error with headers (including timestamps).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) merged-by-bors This PR was explicitly merged by bors. 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

Development

Successfully merging this pull request may close these issues.

9 participants