Skip to content

Small cleanups to the incr comp session code#159000

Merged
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
bjorn3:simplify_incr_comp_session
Jul 20, 2026
Merged

Small cleanups to the incr comp session code#159000
rust-bors[bot] merged 4 commits into
rust-lang:mainfrom
bjorn3:simplify_incr_comp_session

Conversation

@bjorn3

@bjorn3 bjorn3 commented Jul 9, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Found while working on rust-lang/compiler-team#908. I'm working on some more significant changes, but will leave those to a followup PR.

Part of rust-lang/compiler-team#908

bjorn3 added 2 commits July 8, 2026 19:45
@bjorn3
Properly handle errors in finalize_session_directory
fefcf9d 
Previously we would still try to rename the incr comp session dir after
deleting it.
@bjorn3
Remove distinction between finalized and invalid incr comp session
823da8c 
In both cases the incr comp session dir should no longer be accessed.
@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 Jul 9, 2026
@rustbot

rustbot commented Jul 9, 2026

Copy link
Copy Markdown
Collaborator

r? @mejrs

rustbot has assigned @mejrs.
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 75 candidates
  • Random selection from 18 candidates

bjorn3
bjorn3 commented Jul 9, 2026
View reviewed changes
Comment thread compiler/rustc_incremental/src/persist/fs.rs Outdated
bjorn3
bjorn3 commented Jul 9, 2026
View reviewed changes
Comment thread compiler/rustc_incremental/src/persist/fs.rs
@mejrs

mejrs commented Jul 11, 2026

Copy link
Copy Markdown
Contributor

@rustbot reroll

@rustbot rustbot assigned adwinwhite and unassigned mejrs Jul 11, 2026
tiif
tiif reviewed Jul 12, 2026
View reviewed changes

@tiif tiif left a comment •
edited by rustbot
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for the cleanup, I read it closely and it makes sense to me. But I will leave the final r+ to someone more familiar with incr comp.

I just have a nit for the naming :>

View changes since this review

Comment thread compiler/rustc_session/src/session.rs Outdated
This was referenced Jul 13, 2026
Open
Closed
@bjorn3 bjorn3 added the A-incr-comp Area: Incremental compilation label Jul 14, 2026
@bjorn3
bjorn3 force-pushed the simplify_incr_comp_session branch from 750e118 to d792ea9 Compare July 20, 2026 11:32
@adwinwhite

adwinwhite commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Thanks for the cleanup!
r=me after the ci passes or rn if you have built locally.

@bjorn3

bjorn3 commented Jul 20, 2026

Copy link
Copy Markdown
Member Author

./x.py test tests/incremental passes locally.

@bors r=adwinwhite

@rust-bors

rust-bors Bot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit d792ea9 has been approved by adwinwhite

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 Jul 20, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jul 20, 2026
@JonathanBrouwer
Rollup merge of rust-lang#159000 - bjorn3:simplify_incr_comp_session,…
e116cb0 
… r=adwinwhite

Small cleanups to the incr comp session code

Found while working on rust-lang/compiler-team#908. I'm working on some more significant changes, but will leave those to a followup PR.

Part of rust-lang/compiler-team#908
@JonathanBrouwer JonathanBrouwer mentioned this pull request Jul 20, 2026
Closed
rust-bors Bot pushed a commit that referenced this pull request Jul 20, 2026
@bors
Auto merge of #159604 - JonathanBrouwer:rollup-Sb6P4rP, r=JonathanBro…
9169afd 
…uwer

Rollup of 10 pull requests

Successful merges:

 - #159600 (`rust-analyzer` subtree update)
 - #158046 (proc_macro: preserve file module spans for inner attrs)
 - #159000 (Small cleanups to the incr comp session code)
 - #159449 (Enable single Location to issue multiple borrows)
 - #159587 (Improve `AttrItem::span`)
 - #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
 - #159529 (Add regression test for nested replacement ranges in `collect_tokens`)
 - #159585 (Minor `TokenStream` improvements)
 - #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
 - #159603 (Clarify `push_stream`/`push_tree`)

Failed merges:

 - #159590 (Remove some dead code)
@JonathanBrouwer JonathanBrouwer mentioned this pull request Jul 20, 2026
Merged
rust-bors Bot pushed a commit that referenced this pull request Jul 20, 2026
@bors
Auto merge of #159610 - JonathanBrouwer:rollup-Wil0K5d, r=JonathanBro…
87e5904 
…uwer

Rollup of 18 pull requests

Successful merges:

 - #159600 (`rust-analyzer` subtree update)
 - #158046 (proc_macro: preserve file module spans for inner attrs)
 - #159000 (Small cleanups to the incr comp session code)
 - #159189 (Account for type alias projections in E0308 "expected/found" shortening logic)
 - #159449 (Enable single Location to issue multiple borrows)
 - #159544 (Suggest valid command-line crate names)
 - #159587 (Improve `AttrItem::span`)
 - #159594 (feat(rustc_hir_typeck): suggest `impl Fn` return for capturing closures)
 - #159597 (std: use `arc4random_buf` from libc)
 - #159599 (Resolver: Record at least 1 ambiguous trait if main decl is not a trait.)
 - #158061 (Make `pin!()` more foolproof.)
 - #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
 - #159529 (Add regression test for nested replacement ranges in `collect_tokens`)
 - #159571 (Remove unused bundled library lookup for the local crate)
 - #159585 (Minor `TokenStream` improvements)
 - #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
 - #159602 (Remove `ItemLike`)
 - #159603 (Clarify `push_stream`/`push_tree`)

Failed merges:

 - #159590 (Remove some dead code)
@rust-bors
rust-bors Bot merged commit f64867e into rust-lang:main Jul 20, 2026
13 checks passed
@rustbot rustbot added this to the 1.99.0 milestone Jul 20, 2026
rust-timer added a commit that referenced this pull request Jul 20, 2026
@rust-timer
Unrolled build for #159000
1b22436 
Rollup merge of #159000 - bjorn3:simplify_incr_comp_session, r=adwinwhite

Small cleanups to the incr comp session code

Found while working on rust-lang/compiler-team#908. I'm working on some more significant changes, but will leave those to a followup PR.

Part of rust-lang/compiler-team#908
@bjorn3
bjorn3 deleted the simplify_incr_comp_session branch July 21, 2026 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@adwinwhite adwinwhite adwinwhite left review comments
@tiif tiif tiif left review comments

Assignees

@adwinwhite adwinwhite

Labels

A-incr-comp Area: Incremental compilation 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.99.0

Development

Successfully merging this pull request may close these issues.

5 participants

@bjorn3 @rustbot @mejrs @adwinwhite @tiif