Run borrowck tests on BIDs and emit tail-expr-drop-order lints for violations #134523
+155
−19
Conversation
This file contains 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
potential violations
dingxiangfei2009
force-pushed
the
issue-130836-attempt-2
branch
from
beada15 to
054769b
Compare
compiler/rustc_borrowck/src/lib.rs
Outdated
| @@ -994,6 +997,23 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, '_, 'tcx> { | |||
| } | |||
| } | |||
|
|
|||
| fn maybe_polonius_borrows_in_scope<'s>( | |||
There was a problem hiding this comment.
why does this mention polonius at all? why isn't this just called borrows_in_scope?
There was a problem hiding this comment.
Yes, let's.
I am tucking the comment into this function, too.
lqd
reviewed
Dec 19, 2024
Co-authored-by: Rémy Rakic <[email protected]>
nikomatsakis
approved these changes
Dec 19, 2024
|
@bors try |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 19, 2024
…t-2, r=<try> Run borrowck tests on BIDs and emit tail-expr-drop-order lints for violations Fix rust-lang#132861 r? `@nikomatsakis` cc `@compiler-errors` This patch enlarges the scope where the `tail-expr-drop-order` lint applies, so that all locals involved in tail expressions are inspected. This is necessary to run borrow-checking to capture the cases where it used to compile under Edition 2021 but is not going to pass borrow-checking from Edition 2024 onwards. The way it works is to inspect each BID against the set of borrows that are still live. If the local involved in BID has a borrow index which happens to be live as well at the location of this BID statement, in the future this will be a borrow-checking violation. The lint will fire in this case.
|
I have prepared the following craterbot message.
Shall we double-check and give this a go afterwards? Big thanks! |
|
🔒 Error: you're not allowed to interact with this bot. 🔑 If you are a member of the Rust team and need access, add yourself to the whitelist. |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 19, 2024
…-run, r=<try> Crater run for `tail-expr-drop-order` This is experiment for rust-lang#134523
|
☀️ Try build successful - checks-actions |
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.
Fix #132861
r? @nikomatsakis
cc @compiler-errors
This patch enlarges the scope where the
tail-expr-drop-orderlint applies, so that all locals involved in tail expressions are inspected. This is necessary to run borrow-checking to capture the cases where it used to compile under Edition 2021 but is not going to pass borrow-checking from Edition 2024 onwards.The way it works is to inspect each BID against the set of borrows that are still live. If the local involved in BID has a borrow index which happens to be live as well at the location of this BID statement, in the future this will be a borrow-checking violation. The lint will fire in this case.