Small cleanups to the incr comp session code by bjorn3 · Pull Request #159000 · rust-lang/rust

bjorn3 · 2026-07-09T09:33:25Z

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

Previously we would still try to rename the incr comp session dir after deleting it.

In both cases the incr comp session dir should no longer be accessed.

rustbot · 2026-07-09T09:33:31Z

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

mejrs · 2026-07-11T12:04:52Z

@rustbot reroll

tiif

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

adwinwhite · 2026-07-20T11:46:44Z

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

bjorn3 · 2026-07-20T12:02:00Z

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

@bors r=adwinwhite

rust-bors · 2026-07-20T12:02:03Z

📌 Commit d792ea9 has been approved by adwinwhite

It is now in the queue for this repository.

… 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

…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)

…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)

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

…oli-obk Split IncrCompSession out of Session This will allow introducing a separate incr comp session dir for the post LTO artifacts in the future. In addition it statically encodes the lifetime of the incr comp session rather than requiring an enum behind a mutex stored in the Session. Based on rust-lang#159000 Part of rust-lang/compiler-team#908

Rollup merge of #159225 - bjorn3:split_incr_comp_session, r=oli-obk Split IncrCompSession out of Session This will allow introducing a separate incr comp session dir for the post LTO artifacts in the future. In addition it statically encodes the lifetime of the incr comp session rather than requiring an enum behind a mutex stored in the Session. Based on #159000 Part of rust-lang/compiler-team#908

Split IncrCompSession out of Session This will allow introducing a separate incr comp session dir for the post LTO artifacts in the future. In addition it statically encodes the lifetime of the incr comp session rather than requiring an enum behind a mutex stored in the Session. Based on rust-lang/rust#159000 Part of rust-lang/compiler-team#908

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

bjorn3 · 2026-07-09T09:33:25Z