Skip to content

Add -Zassert-incr-state to assert state of incremental cache - #90386

Merged
bors merged 1 commit into
rust-lang:masterfrom
pierwill:assert-incr-state-85864
Nov 18, 2021
Merged

Add -Zassert-incr-state to assert state of incremental cache#90386
bors merged 1 commit into
rust-lang:masterfrom
pierwill:assert-incr-state-85864

Conversation

@pierwill

@pierwillpierwill commented Oct 28, 2021

Copy link
Copy Markdown
Contributor

Closes#85864.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @oli-obk

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 28, 2021
@pierwill
pierwill marked this pull request as draft October 28, 2021 20:34
@pierwill

Copy link
Copy Markdown
ContributorAuthor

r? @Aaron1011

@rust-log-analyzer

This comment has been minimized.

@pierwill
pierwillforce-pushed the assert-incr-state-85864 branch from 9fa372f to 0388331CompareOctober 28, 2021 21:27
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

Comment threadcompiler/rustc_interface/src/tests.rs Outdated
Comment threadcompiler/rustc_session/src/options.rs Outdated
Comment threadcompiler/rustc_incremental/src/persist/load.rs Outdated
Comment threadcompiler/rustc_incremental/src/persist/load.rs Outdated
Comment threadcompiler/rustc_session/src/config.rs Outdated
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@pierwill
pierwillforce-pushed the assert-incr-state-85864 branch from 7e6a02d to 4679489CompareOctober 29, 2021 15:05
@rust-log-analyzer

This comment has been minimized.

@pierwill

Copy link
Copy Markdown
ContributorAuthor

Having trouble figuring out what's causing this panic. x check runs successfully.

@rust-log-analyzer

This comment has been minimized.

@pierwillpierwill changed the title [WIP] Add -Zassert-incr-state to assert state of incremental cache[WIP] Add -Zassert-incr-state to assert state of incremental cacheOct 29, 2021
@pierwillpierwill changed the title [WIP] Add -Zassert-incr-state to assert state of incremental cacheAdd -Zassert-incr-state to assert state of incremental cacheOct 30, 2021
@pierwill
pierwill marked this pull request as ready for review October 30, 2021 15:24
Comment threadcompiler/rustc_session/src/config.rs Outdated
Comment threadcompiler/rustc_incremental/src/persist/load.rs Outdated
@pierwill
pierwillforce-pushed the assert-incr-state-85864 branch from 88cd57c to 1684347CompareOctober 31, 2021 22:06
@rust-log-analyzer

This comment has been minimized.

@Aaron1011Aaron1011 removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 1, 2021
@pierwill
pierwillforce-pushed the assert-incr-state-85864 branch 3 times, most recently from 15eaf5f to 0c8da93CompareNovember 8, 2021 19:47
@pierwill

Copy link
Copy Markdown
ContributorAuthor

@rustbot ready

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 9, 2021
@apirainoapiraino added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Nov 11, 2021
@pierwill
pierwillforce-pushed the assert-incr-state-85864 branch from 0c8da93 to 1642fdfCompareNovember 12, 2021 19:41
@Aaron1011

Copy link
Copy Markdown
Contributor

Sorry for the delay in getting to this.

@bors r+

@bors

bors commented Nov 17, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 1642fdf has been approved by Aaron1011

@borsbors 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 Nov 17, 2021
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 18, 2021
…=Aaron1011
Add `-Zassert-incr-state` to assert state of incremental cache
Closesrust-lang#85864.
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Nov 18, 2021
…=Aaron1011
Add `-Zassert-incr-state` to assert state of incremental cache
Closesrust-lang#85864.
@JohnTitorJohnTitor mentioned this pull request Nov 18, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Nov 18, 2021
…=Aaron1011
Add `-Zassert-incr-state` to assert state of incremental cache
Closesrust-lang#85864.
@JohnTitorJohnTitor mentioned this pull request Nov 18, 2021
@JohnTitorJohnTitor mentioned this pull request Nov 18, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 18, 2021
Rollup of 8 pull requests
Successful merges:
- rust-lang#90386 (Add `-Zassert-incr-state` to assert state of incremental cache)
- rust-lang#90438 (Clean up mess for --show-coverage documentation)
- rust-lang#90480 (Mention `Vec::remove` in `Vec::swap_remove`'s docs)
- rust-lang#90607 (Make slice->str conversion and related functions `const`)
- rust-lang#90750 (rustdoc: Replace where-bounded Clean impl with simple function)
- rust-lang#90895 (require full validity when determining the discriminant of a value)
- rust-lang#90989 (Avoid suggesting literal formatting that turns into member access)
- rust-lang#91002 (rustc: Remove `#[rustc_synthetic]`)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 728b3f2 into rust-lang:masterNov 18, 2021
@rustbotrustbot added this to the 1.58.0 milestone Nov 18, 2021
RalfJung added a commit to RalfJung/rust that referenced this pull request Mar 28, 2026
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 rust-lang#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.
rust-timer added a commit that referenced this pull request Mar 28, 2026
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.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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.

Add debugging flag to assert state of incremental cache

9 participants

@pierwill@rust-highfive@rust-log-analyzer@Aaron1011@bors@jyn514@oli-obk@apiraino@rustbot