Re-expose nested bodies in rustc_borrowck::consumers #143666
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
|
👍 @bors r+ rollup |
bors
added
S-waiting-on-bors
Kobzol
added a commit
to Kobzol/rust
that referenced
this pull request
Jul 9, 2025
…rs, r=lcnr Re-expose nested bodies in rustc_borrowck::consumers After rust-lang#138499, it's not possible anymore to get borrowck information for nested bodies via `get_body_with_borrowck_facts`. This PR re-exposes nested bodies by returning a map containing the typeck root and all its nested bodies. To collect the bodies, a map is added to `BorrowCheckRootCtxt`, and a body is inserted every time `do_mir_borrowck` is called. r? `@lcnr`
bors
added a commit
that referenced
this pull request
Jul 9, 2025
Rollup of 6 pull requests Successful merges: - #143398 (tidy: add support for `--extra-checks=auto:` feature) - #143446 (use `--dynamic-list` for exporting executable symbols) - #143644 (Add triagebot stdarch mention ping) - #143660 (Disable docs for `compiler-builtins` and `sysroot`) - #143666 (Re-expose nested bodies in rustc_borrowck::consumers) - #143668 (Fix VxWorks build errors) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
that referenced
this pull request
Jul 10, 2025
Rollup of 12 pull requests Successful merges: - #136906 (Add checking for unnecessary delims in closure body) - #143652 (docs: document trait upcasting rules in `Unsize` trait) - #143657 (Resolver: refact macro map into external and local maps) - #143659 (Use "Innermost" & "Outermost" terminology for `AttributeOrder`) - #143663 (fix: correct typo in attr_parsing_previously_accepted message key) - #143666 (Re-expose nested bodies in rustc_borrowck::consumers) - #143668 (Fix VxWorks build errors) - #143670 (Add a new maintainer to the wasm32-wasip1 target) - #143675 (improve lint doc text) - #143683 (Assorted `run-make-support` maintenance) - #143695 (Auto-add `S-waiting-on-author` when the PR is/switches to draft state) - #143706 (triagebot.toml: ping lolbinarycat if tidy extra checks were modified) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Jul 10, 2025
Rollup merge of #143666 - nilehmann:nested_bodies_in_consumers, r=lcnr Re-expose nested bodies in rustc_borrowck::consumers After #138499, it's not possible anymore to get borrowck information for nested bodies via `get_body_with_borrowck_facts`. This PR re-exposes nested bodies by returning a map containing the typeck root and all its nested bodies. To collect the bodies, a map is added to `BorrowCheckRootCtxt`, and a body is inserted every time `do_mir_borrowck` is called. r? ``@lcnr``
|
@rust-timer build 85cfd4a Checking for #143731. |
This comment has been minimized.
This comment has been minimized.
|
Finished benchmarking commit (85cfd4a): comparison URL. Overall result: no relevant changes - no action neededBenchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf. @bors rollup=never Instruction countThis benchmark run did not return any relevant results for this metric. Max RSS (memory usage)Results (primary -3.1%, secondary 5.1%)A less reliable metric. May be of interest, but not used to determine the overall result above.
CyclesThis benchmark run did not return any relevant results for this metric. Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 463.013s -> 463.275s (0.06%) |
lnicola
pushed a commit
to lnicola/rust-analyzer
that referenced
this pull request
Jul 15, 2025
Rollup of 12 pull requests Successful merges: - rust-lang/rust#136906 (Add checking for unnecessary delims in closure body) - rust-lang/rust#143652 (docs: document trait upcasting rules in `Unsize` trait) - rust-lang/rust#143657 (Resolver: refact macro map into external and local maps) - rust-lang/rust#143659 (Use "Innermost" & "Outermost" terminology for `AttributeOrder`) - rust-lang/rust#143663 (fix: correct typo in attr_parsing_previously_accepted message key) - rust-lang/rust#143666 (Re-expose nested bodies in rustc_borrowck::consumers) - rust-lang/rust#143668 (Fix VxWorks build errors) - rust-lang/rust#143670 (Add a new maintainer to the wasm32-wasip1 target) - rust-lang/rust#143675 (improve lint doc text) - rust-lang/rust#143683 (Assorted `run-make-support` maintenance) - rust-lang/rust#143695 (Auto-add `S-waiting-on-author` when the PR is/switches to draft state) - rust-lang/rust#143706 (triagebot.toml: ping lolbinarycat if tidy extra checks were modified) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
After #138499, it's not possible anymore to get borrowck information for nested bodies via
get_body_with_borrowck_facts. This PR re-exposes nested bodies by returning a map containing the typeck root and all its nested bodies. To collect the bodies, a map is added toBorrowCheckRootCtxt, and a body is inserted every timedo_mir_borrowckis called.r? @lcnr