-
Notifications
You must be signed in to change notification settings - Fork 13k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #47607 - davidtwco:issue-45697, r=nikomatsakis
MIR-borrowck: augmented assignment causes duplicate errors Fixes #45697. This PR resolves the error duplication. I attempted to replace the existing sets since there were quite a few but only managed to replace two of them. r? @nikomatsakis
- Loading branch information
Showing
7 changed files
with
150 additions
and
48 deletions.
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,35 @@ | ||
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
// Test that assignments to an `&mut` pointer which is found in a | ||
// borrowed (but otherwise non-aliasable) location is illegal. | ||
|
||
// compile-flags: -Z emit-end-regions -Z borrowck=compare -C overflow-checks=on | ||
|
||
struct S<'a> { | ||
pointer: &'a mut isize | ||
} | ||
|
||
fn copy_borrowed_ptr<'a>(p: &'a mut S<'a>) -> S<'a> { | ||
S { pointer: &mut *p.pointer } | ||
} | ||
|
||
fn main() { | ||
let mut x = 1; | ||
|
||
{ | ||
let mut y = S { pointer: &mut x }; | ||
let z = copy_borrowed_ptr(&mut y); | ||
*y.pointer += 1; | ||
//~^ ERROR cannot assign to `*y.pointer` because it is borrowed (Ast) [E0506] | ||
//~| ERROR cannot use `*y.pointer` because it was mutably borrowed (Mir) [E0503] | ||
*z.pointer += 1; | ||
} | ||
} |
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,18 @@ | ||
error[E0506]: cannot assign to `*y.pointer` because it is borrowed (Ast) | ||
--> $DIR/issue-45697-1.rs:30:9 | ||
| | ||
29 | let z = copy_borrowed_ptr(&mut y); | ||
| - borrow of `*y.pointer` occurs here | ||
30 | *y.pointer += 1; | ||
| ^^^^^^^^^^^^^^^ assignment to borrowed `*y.pointer` occurs here | ||
|
||
error[E0503]: cannot use `*y.pointer` because it was mutably borrowed (Mir) | ||
--> $DIR/issue-45697-1.rs:30:9 | ||
| | ||
29 | let z = copy_borrowed_ptr(&mut y); | ||
| ------ borrow of `y` occurs here | ||
30 | *y.pointer += 1; | ||
| ^^^^^^^^^^^^^^^ use of borrowed `y` | ||
|
||
error: aborting due to 2 previous errors | ||
|
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,35 @@ | ||
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
// Test that assignments to an `&mut` pointer which is found in a | ||
// borrowed (but otherwise non-aliasable) location is illegal. | ||
|
||
// compile-flags: -Z emit-end-regions -Z borrowck=compare -C overflow-checks=off | ||
|
||
struct S<'a> { | ||
pointer: &'a mut isize | ||
} | ||
|
||
fn copy_borrowed_ptr<'a>(p: &'a mut S<'a>) -> S<'a> { | ||
S { pointer: &mut *p.pointer } | ||
} | ||
|
||
fn main() { | ||
let mut x = 1; | ||
|
||
{ | ||
let mut y = S { pointer: &mut x }; | ||
let z = copy_borrowed_ptr(&mut y); | ||
*y.pointer += 1; | ||
//~^ ERROR cannot assign to `*y.pointer` because it is borrowed (Ast) [E0506] | ||
//~| ERROR cannot use `*y.pointer` because it was mutably borrowed (Mir) [E0503] | ||
*z.pointer += 1; | ||
} | ||
} |
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,18 @@ | ||
error[E0506]: cannot assign to `*y.pointer` because it is borrowed (Ast) | ||
--> $DIR/issue-45697.rs:30:9 | ||
| | ||
29 | let z = copy_borrowed_ptr(&mut y); | ||
| - borrow of `*y.pointer` occurs here | ||
30 | *y.pointer += 1; | ||
| ^^^^^^^^^^^^^^^ assignment to borrowed `*y.pointer` occurs here | ||
|
||
error[E0503]: cannot use `*y.pointer` because it was mutably borrowed (Mir) | ||
--> $DIR/issue-45697.rs:30:9 | ||
| | ||
29 | let z = copy_borrowed_ptr(&mut y); | ||
| ------ borrow of `y` occurs here | ||
30 | *y.pointer += 1; | ||
| ^^^^^^^^^^^^^^^ use of borrowed `y` | ||
|
||
error: aborting due to 2 previous errors | ||
|