borrowck: Represent 'best blame constraint' as index into Vec<OutlivesConstraint>#159201
Merged
Merged
Conversation
…esConstraint>` This makes the code simpler and easier to understand, since we don't have to partially copy an `OutlivesConstraint` into the `BlameConstraint` struct (which we can remove entirely) and the `BorrowExplanation::MustBeValidFor` enum variant (which we can simplify). Instead, we reference the "best" `OutlivesConstraint` by an index into `Vec<OutlivesConstraint>`. This is not only simpler, it also opens up the possibility for diagnostics to access the full `OutlivesConstraint` info.
rustbot
added
S-waiting-on-review
Collaborator
|
r? @jieyouxu rustbot has assigned @jieyouxu. Use Why was this reviewer chosen?The reviewer was selected based on:
|
jieyouxu
approved these changes
Jul 13, 2026
Contributor
rust-bors
Bot
added
S-waiting-on-bors
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 13, 2026
Rollup of 11 pull requests Successful merges: - #159210 (`rust-analyzer` subtree update) - #158655 (Fix coroutine MIR saved local remapping) - #159205 (bootstrap: Replace `ShouldRun::crates` with `crate_or_deps_filtered`) - #159208 (Fix `attr_on_non_tail_expr` typo) - #157524 (Fix relative paths in private import suggestions) - #158325 (Document NonNull layout guarantees) - #158882 (enable `do_not_recommend` attr for method call errors in current solver) - #158982 (Pretty-print MIR user types too.) - #159069 (Add codegen test for constant returns after local use) - #159163 (rustc_target: Add acquire-release to implied features of v8) - #159201 (borrowck: Represent 'best blame constraint' as index into `Vec<OutlivesConstraint>`)
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 13, 2026
Rollup of 11 pull requests Successful merges: - #159210 (`rust-analyzer` subtree update) - #158655 (Fix coroutine MIR saved local remapping) - #159205 (bootstrap: Replace `ShouldRun::crates` with `crate_or_deps_filtered`) - #159208 (Fix `attr_on_non_tail_expr` typo) - #157524 (Fix relative paths in private import suggestions) - #158325 (Document NonNull layout guarantees) - #158882 (enable `do_not_recommend` attr for method call errors in current solver) - #158982 (Pretty-print MIR user types too.) - #159069 (Add codegen test for constant returns after local use) - #159163 (rustc_target: Add acquire-release to implied features of v8) - #159201 (borrowck: Represent 'best blame constraint' as index into `Vec<OutlivesConstraint>`)
rust-timer
added a commit
that referenced
this pull request
Jul 13, 2026
Rollup merge of #159201 - Enselic:best-blame-index, r=jieyouxu borrowck: Represent 'best blame constraint' as index into `Vec<OutlivesConstraint>` This makes the code simpler and easier to understand, since we don't have to partially copy an `OutlivesConstraint` into the `BlameConstraint` struct (which we can remove entirely) and the `BorrowExplanation::MustBeValidFor` enum variant (which we can simplify). Instead, we reference the "best" `OutlivesConstraint` by an index into `Vec<OutlivesConstraint>`. This is not only simpler, it also opens up the possibility for diagnostics to access the full `OutlivesConstraint` info. I discovered this simplification while investigating ways to solve #138408. (See #158623 for the preparations for this commit.)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This makes the code simpler and easier to understand, since we don't have to partially copy an
OutlivesConstraintinto theBlameConstraintstruct (which we can remove entirely) and theBorrowExplanation::MustBeValidForenum variant (which we can simplify).Instead, we reference the "best"
OutlivesConstraintby an index intoVec<OutlivesConstraint>. This is not only simpler, it also opens up the possibility for diagnostics to access the fullOutlivesConstraintinfo.I discovered this simplification while investigating ways to solve #138408.
(See #158623 for the preparations for this commit.)