Skip to content

Rollup of 5 pull requests#155339

Merged
rust-bors[bot] merged 16 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-2nyGW0a
Apr 15, 2026
Merged

Rollup of 5 pull requests#155339
rust-bors[bot] merged 16 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-2nyGW0a

Conversation

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

cyrgani and others added 16 commits April 14, 2026 11:16
Reformat `top_level_options!` and `options!` macro declarations

These macros are already tricky, and having weird formatting doesn't help. Using a more regular style makes it easier to see where nesting begins and ends.

Extracted from rust-lang#154501 after the changes in rust-lang#149357 made rebasing very difficult.

There should be no change to compiler behaviour.
…, r=JohnTitor

`CValue::zst()` - add missing "ZST" in docs
…trochenkov

various small `rustc_expand` cleanups

Each commit should be reviewable on its own.
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Apr 15, 2026
@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-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. labels Apr 15, 2026
@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 15, 2026

📌 Commit 439410f has been approved by JonathanBrouwer

It is now in the queue for this repository.

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

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Apr 15, 2026
…uwer

Rollup of 5 pull requests

Successful merges:

 - #155331 (Reformat `top_level_options!` and `options!` macro declarations)
 - #155332 (bump std libc to `0.2.185`)
 - #155286 (attribute cleanup: rustc_confusables)
 - #155306 (`CValue::zst()` - add missing "ZST" in docs)
 - #155311 (various small `rustc_expand` cleanups)
@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 Apr 15, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 15, 2026

💔 Test for 71f4f54 failed: CI. Failed job:

@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)
##[endgroup]
Image input checksum 8808edb3604b1e929c1d2316d5912ca04329fa4b79e352f54c4425ff2e75e3d082c6d57477973c2148874869471a5a7aa49b7e66acae5d358298ea79ea409354
##[group]Building docker image for x86_64-gnu-llvm-22
Docker version 28.0.4, build b8034c0
Error response from daemon: Get "https://ghcr.io/v2/": dial tcp: lookup ghcr.io on 127.0.0.53:53: read udp 127.0.0.1:46511->127.0.0.53:53: i/o timeout
##[error]Process completed with exit code 1.
##[group]Run echo "disk usage:"
echo "disk usage:"
df -h
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}

@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

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

This comment has been minimized.

@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 Apr 15, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 15, 2026

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 14m 24s
Pushing 9620eae to main...

@rust-bors rust-bors bot merged commit 9620eae into rust-lang:main Apr 15, 2026
12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Apr 15, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#155286 attribute cleanup: rustc_confusables 0a44ccd3a2ff698404577b41b179de996ca468ea (link)
#155306 CValue::zst() - add missing "ZST" in docs b5ac24530910388894ad51efe5857c811a12a870 (link)
#155311 various small rustc_expand cleanups 94ff1e79e9ca946743225174017061f24c4b03ee (link)
#155331 Reformat top_level_options! and options! macro declarat… 15274c78307f6162427fc4583aedb21988dc7ac1 (link)
#155332 bump std libc to 0.2.185 bde168c7593ef3c81a2b81c78b0611bc7acef784 (link)

previous master: 32e4c0ecbd

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@github-actions
Copy link
Copy Markdown
Contributor

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 32e4c0e (parent) -> 9620eae (this PR)

Test differences

Show 2 test diffs

2 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 9620eae30ab7614dcb72d44c4ce1dac497f6ae18 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. dist-apple-various: 2h 11m -> 1h 21m (-37.4%)
  2. x86_64-gnu-miri: 1h 8m -> 1h 33m (+36.1%)
  3. i686-gnu-nopt-2: 2h 20m -> 1h 47m (-23.7%)
  4. dist-i686-mingw: 2h 53m -> 2h 12m (-23.5%)
  5. dist-x86_64-apple: 2h 11m -> 1h 42m (-21.9%)
  6. dist-aarch64-apple: 1h 55m -> 1h 29m (-21.8%)
  7. dist-powerpc64-linux-musl: 1h 40m -> 1h 20m (-19.7%)
  8. x86_64-msvc-2: 2h 32m -> 2h 5m (-18.0%)
  9. dist-aarch64-msvc: 1h 49m -> 1h 33m (-15.0%)
  10. dist-x86_64-freebsd: 1h 9m -> 1h 19m (+13.9%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (9620eae): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

Results (primary -1.8%, secondary 2.9%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.9% [2.9%, 2.9%] 1
Improvements ✅
(primary)
-1.8% [-1.8%, -1.8%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -1.8% [-1.8%, -1.8%] 1

Cycles

Results (secondary -2.8%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.8% [-2.8%, -2.8%] 1
All ❌✅ (primary) - - 0

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 490.627s -> 489.918s (-0.14%)
Artifact size: 394.10 MiB -> 394.13 MiB (0.01%)

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. rollup A PR which is a rollup 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-rust-analyzer Relevant to the rust-analyzer 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