Skip to content

Commit

Permalink
Rollup merge of rust-lang#94553 - lcnr:add-tests, r=Dylan-DPC
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiaskrgr authored Mar 7, 2022
2 parents 297273c + dad81b6 commit 2c98eda
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 0 deletions.
28 changes: 28 additions & 0 deletions src/test/ui/nll/lint-no-err.rs
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
}
17 changes: 17 additions & 0 deletions src/test/ui/nll/lint-no-err.stderr
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

0 comments on commit 2c98eda

Please sign in to comment.