Skip to content

various small rustc_expand cleanups#155311

Merged
rust-bors[bot] merged 7 commits intorust-lang:mainfrom
cyrgani:expand-clean
Apr 15, 2026
Merged

various small rustc_expand cleanups#155311
rust-bors[bot] merged 7 commits intorust-lang:mainfrom
cyrgani:expand-clean

Conversation

@cyrgani
Copy link
Copy Markdown
Contributor

@cyrgani cyrgani commented Apr 14, 2026

Each commit should be reviewable on its own.

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 14, 2026

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

@rustbot 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. T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. labels Apr 14, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 14, 2026

r? @BoxyUwU

rustbot has assigned @BoxyUwU.
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 69 candidates
  • Random selection from 14 candidates

@Kivooeo
Copy link
Copy Markdown
Member

Kivooeo commented Apr 15, 2026

r? me

just wondering about how much this affects perf

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

@rustbot rustbot assigned Kivooeo and unassigned BoxyUwU Apr 15, 2026
@rust-bors

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Apr 15, 2026
various small `rustc_expand` cleanups
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 15, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 15, 2026

☀️ Try build successful (CI)
Build commit: dc646e9 (dc646e9b0338941cd2c6068cc00555cebac17041, parent: a5c825cd824ee0ef9463021078a2f464b4cc1a0d)

@rust-timer

This comment has been minimized.

@rust-timer
Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (dc646e9): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking means the PR may be perf-sensitive. It's automatically marked not fit for rolling up. Overriding is possible but disadvised: it risks changing compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

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

Max RSS (memory usage)

Results (secondary 1.0%)

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)
6.3% [6.3%, 6.3%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-4.4% [-4.4%, -4.4%] 1
All ❌✅ (primary) - - 0

Cycles

Results (primary 4.9%, secondary 0.2%)

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

mean range count
Regressions ❌
(primary)
6.3% [1.1%, 15.4%] 6
Regressions ❌
(secondary)
2.9% [2.6%, 3.8%] 4
Improvements ✅
(primary)
-3.4% [-3.4%, -3.4%] 1
Improvements ✅
(secondary)
-5.2% [-6.6%, -3.9%] 2
All ❌✅ (primary) 4.9% [-3.4%, 15.4%] 7

Binary size

Results (primary 0.1%, secondary 0.1%)

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

mean range count
Regressions ❌
(primary)
0.1% [0.0%, 0.1%] 15
Regressions ❌
(secondary)
0.1% [0.0%, 0.1%] 20
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.1% [0.0%, 0.1%] 15

Bootstrap: 489.296s -> 491.084s (0.37%)
Artifact size: 394.04 MiB -> 394.21 MiB (0.04%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 15, 2026
@petrochenkov petrochenkov self-assigned this Apr 15, 2026
@petrochenkov petrochenkov removed their assignment Apr 15, 2026
@Kivooeo
Copy link
Copy Markdown
Member

Kivooeo commented Apr 15, 2026

@bors r=Kivooeo,petrochenkov rollup

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 15, 2026

📌 Commit 2e3036d has been approved by Kivooeo,petrochenkov

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 Apr 15, 2026
@rust-bors rust-bors bot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 15, 2026
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 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-timer added a commit that referenced this pull request Apr 15, 2026
Rollup merge of #155311 - cyrgani:expand-clean, r=Kivooeo,petrochenkov

various small `rustc_expand` cleanups

Each commit should be reviewable on its own.
@rust-bors rust-bors bot merged commit 439410f into rust-lang:main Apr 15, 2026
12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Apr 15, 2026
@cyrgani cyrgani deleted the expand-clean branch April 15, 2026 18:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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-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.

6 participants