Skip to content

Use the normal arg-parsing machinery for -Zassert-incr-state#154450

Merged
rust-bors[bot] merged 2 commits intorust-lang:mainfrom
Zalathar:assert-incr-state
Mar 28, 2026
Merged

Use the normal arg-parsing machinery for -Zassert-incr-state#154450
rust-bors[bot] merged 2 commits intorust-lang:mainfrom
Zalathar:assert-incr-state

Conversation

@Zalathar
Copy link
Copy Markdown
Member

@Zalathar Zalathar commented Mar 27, 2026

The flag parser for -Zassert-incr-state currently extracts an Option<String>, and then performs an ad-hoc parsing step slightly later. From looking at #90386, I can't see any reason why it doesn't just use the normal flag-parsing machinery.

A second commit also extracts the underlying implementation to a separate helper function, so that it isn't cluttering up the main control flow.

I found this while working on larger cleanups to incremental-file loading.

@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 Mar 27, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Mar 27, 2026

r? @fmease

rustbot has assigned @fmease.
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 12 candidates

fmease
fmease approved these changes Mar 27, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@fmease fmease left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! @bors r+ rollup

View changes since this review

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 27, 2026

📌 Commit 1ff9989 has been approved by fmease

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 Mar 27, 2026
@fmease fmease mentioned this pull request Mar 27, 2026
Merged
@fmease
Copy link
Copy Markdown
Member

fmease commented Mar 27, 2026 •
edited
Loading

(conflicts with #154070, will soon become unmergeable)

rust-bors bot pushed a commit that referenced this pull request Mar 27, 2026
@bors
Auto merge of #154466 - fmease:rollup-RqOocPd, r=fmease
c164e63 
Rollup of 10 pull requests

Successful merges:

 - #154070 (Unstable book options parser)
 - #154371 (Use LocalDefId for more tcx method calls)
 - #154405 (Improve doc comment unicode guidance)
 - #154431 (Avoid ICE in explicit reference cast suggestion for unrelated leaf pr…)
 - #153528 (Fix LegacyKeyValueFormat report from docker build: mips)
 - #154246 (Add test for issue #101532: dead code warnings in const _)
 - #154421 (Rustdoc rejects html emits with json output)
 - #154428 (bootstrap: `-Zjson-target-spec` for synthetic targets)
 - #154437 (bootstrap.example.toml: Hint how to allow `build.warnings`)
 - #154454 (fix: [rustfmt] prevent panic when rewritng associated item delegations)

Failed merges:

 - #154450 (Use the normal arg-parsing machinery for `-Zassert-incr-state`)
rust-bors bot pushed a commit that referenced this pull request Mar 27, 2026
@bors
Auto merge of #154466 - fmease:rollup-RqOocPd, r=fmease
e161368 
Rollup of 10 pull requests

Successful merges:

 - #154070 (Unstable book options parser)
 - #154371 (Use LocalDefId for more tcx method calls)
 - #154405 (Improve doc comment unicode guidance)
 - #154431 (Avoid ICE in explicit reference cast suggestion for unrelated leaf pr…)
 - #153528 (Fix LegacyKeyValueFormat report from docker build: mips)
 - #154246 (Add test for issue #101532: dead code warnings in const _)
 - #154421 (Rustdoc rejects html emits with json output)
 - #154428 (bootstrap: `-Zjson-target-spec` for synthetic targets)
 - #154437 (bootstrap.example.toml: Hint how to allow `build.warnings`)
 - #154454 (fix: [rustfmt] prevent panic when rewritng associated item delegations)

Failed merges:

 - #154450 (Use the normal arg-parsing machinery for `-Zassert-incr-state`)
@rust-bors rust-bors bot 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 28, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@Zalathar Zalathar force-pushed the assert-incr-state branch from 1ff9989 to ef5227f Compare March 28, 2026 02:30
@rustbot

This comment has been minimized.

Sign in to view
@Zalathar
Copy link
Copy Markdown
Member Author

Zalathar commented Mar 28, 2026

Rebased to resolve conflicts.

@bors r=fmease

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 28, 2026

📌 Commit ef5227f has been approved by fmease

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 Mar 28, 2026
@Zalathar
Copy link
Copy Markdown
Member Author

Zalathar commented Mar 28, 2026

@bors r-

@rust-bors rust-bors bot 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 28, 2026
Zalathar added 2 commits March 28, 2026 21:52
@Zalathar
Use the normal arg-parsing machinery for -Zassert-incr-state
29be059
@Zalathar
Extract -Zassert-incr-state into a separate helper function
10d29ee 
This code is only needed by an obscure `-Z` flag, so pulling it out of the main
path makes the normal logic easier to follow.
@Zalathar Zalathar force-pushed the assert-incr-state branch from ef5227f to 10d29ee Compare March 28, 2026 10:53
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Mar 28, 2026

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@Zalathar
Copy link
Copy Markdown
Member Author

Zalathar commented Mar 28, 2026

Rebased again.

@bors r=fmease

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 28, 2026

📌 Commit 10d29ee has been approved by fmease

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 Mar 28, 2026
@RalfJung RalfJung mentioned this pull request Mar 28, 2026
Merged
rust-bors bot pushed a commit that referenced this pull request Mar 28, 2026
@bors
Auto merge of #154503 - RalfJung:rollup-DkU2JXL, r=RalfJung
0d4eb09 
Rollup of 11 pull requests

Successful merges:

 - #152880 (Tweak incorrect assoc item note)
 - #153526 (Fix LegacyKeyValueFormat report from docker build: i686)
 - #153613 (interpreter error reporting: remove arguments that are always the same)
 - #154029 (Replace `truncate(0)` with `clear()`)
 - #154125 (Inline and remove `DepGraphData::try_mark_parent_green`.)
 - #154185 (Prevent no_threads RwLock's write() impl from setting mode to -1 when it is locked for reading)
 - #154394 (Normalize rustc path prefix when testing `-Z track-diagnostics`)
 - #154450 (Use the normal arg-parsing machinery for `-Zassert-incr-state`)
 - #154475 (Emit a pre-expansion feature gate warning for `box`'ed struct field patterns)
 - #154500 (EnumSizeOpt: use Allocation::write_scalar instead of manual endianess logic)
 - #154502 (interpret: ensure that untupled arguments are actually tuples)
@rust-bors rust-bors bot merged commit effcc70 into rust-lang:main Mar 28, 2026
11 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 28, 2026
rust-timer added a commit that referenced this pull request Mar 28, 2026
@rust-timer
Unrolled build for #154450
7dd63db 
Rollup merge of #154450 - Zalathar:assert-incr-state, r=fmease

Use the normal arg-parsing machinery for `-Zassert-incr-state`

The flag parser for `-Zassert-incr-state` currently extracts an `Option<String>`, and then performs an ad-hoc parsing step slightly later. From looking at #90386, I can't see any reason why it doesn't just use the normal flag-parsing machinery.

A second commit also extracts the underlying implementation to a separate helper function, so that it isn't cluttering up the main control flow.

I found this while working on larger cleanups to incremental-file loading.
@Zalathar Zalathar deleted the assert-incr-state branch March 28, 2026 22:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fmease fmease fmease approved these changes

Assignees

@fmease fmease

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

Milestone

1.96.0

Development

Successfully merging this pull request may close these issues.

3 participants

@Zalathar @rustbot @fmease