-
Notifications
You must be signed in to change notification settings - Fork 12.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[beta] backport fix for #94502 #94552
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
// check-pass | ||
|
||
// mir borrowck previously incorrectly set `tainted_by_errors` | ||
// when buffering lints, which resulted in ICE later on, | ||
// see #94502. | ||
|
||
// Errors with `nll` which is already tested in enough other tests, | ||
// so we ignore it here. | ||
// | ||
// ignore-compare-mode-nll | ||
|
||
struct Repro; | ||
impl Repro { | ||
fn get(&self) -> &i32 { | ||
&3 | ||
} | ||
|
||
fn insert(&mut self, _: i32) {} | ||
} | ||
|
||
fn main() { | ||
let x = &0; | ||
let mut conflict = Repro; | ||
let prev = conflict.get(); | ||
conflict.insert(*prev + *x); | ||
//~^ WARN cannot borrow `conflict` as mutable because it is also borrowed as immutable | ||
//~| WARN this borrowing pattern was not meant to be accepted | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
warning: cannot borrow `conflict` as mutable because it is also borrowed as immutable | ||
--> $DIR/lint-no-err.rs:25:5 | ||
| | ||
LL | let prev = conflict.get(); | ||
| -------------- immutable borrow occurs here | ||
LL | conflict.insert(*prev + *x); | ||
| ^^^^^^^^^^^^^^^^-----^^^^^^ | ||
| | | | ||
| | immutable borrow later used here | ||
| mutable borrow occurs here | ||
| | ||
= note: `#[warn(mutable_borrow_reservation_conflict)]` on by default | ||
= warning: this borrowing pattern was not meant to be accepted, and may become a hard error in the future | ||
= note: for more information, see issue #59159 <https://github.com/rust-lang/rust/issues/59159> | ||
|
||
warning: 1 warning emitted | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess we would want to land this on nightly as well?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
already planned to do that 😆 #94553