Skip to content

Reformat top_level_options! and options! macro declarations#155331

Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
Zalathar:options-fmt
Apr 15, 2026
Merged

Reformat top_level_options! and options! macro declarations#155331
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
Zalathar:options-fmt

Conversation

@Zalathar
Copy link
Copy Markdown
Member

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 #154501 after the changes in #149357 made rebasing very difficult.

There should be no change to compiler behaviour.

@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. labels Apr 15, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 15, 2026

r? @petrochenkov

rustbot has assigned @petrochenkov.
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 16 candidates

Comment thread compiler/rustc_session/src/options.rs
@petrochenkov
Copy link
Copy Markdown
Contributor

r=me after answering #155331 (comment).
@rustbot author

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

@bors r+

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 15, 2026

📌 Commit 4506131 has been approved by petrochenkov

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels 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-bors rust-bors bot merged commit e4eff63 into rust-lang:main Apr 15, 2026
11 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Apr 15, 2026
rust-timer added a commit that referenced this pull request Apr 15, 2026
Rollup merge of #155331 - Zalathar:options-fmt, r=petrochenkov

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 #154501 after the changes in #149357 made rebasing very difficult.

There should be no change to compiler behaviour.
@Zalathar Zalathar deleted the options-fmt branch April 15, 2026 21:48
github-actions bot pushed a commit to rust-lang/rust-analyzer that referenced this pull request Apr 16, 2026
…uwer

Rollup of 5 pull requests

Successful merges:

 - rust-lang/rust#155331 (Reformat `top_level_options!` and `options!` macro declarations)
 - rust-lang/rust#155332 (bump std libc to `0.2.185`)
 - rust-lang/rust#155286 (attribute cleanup: rustc_confusables)
 - rust-lang/rust#155306 (`CValue::zst()` - add missing "ZST" in docs)
 - rust-lang/rust#155311 (various small `rustc_expand` cleanups)
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants