-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #81629 - 1000teslas:issue-81365-fix, r=Aaron1011
Point out implicit deref coercions in borrow Fixes #81365 `@Aaron1011` I'm not sure why my code shows the note even in an implicit `Deref` call. See the output for `issue-81365-8.rs`.
- Loading branch information
Showing
23 changed files
with
557 additions
and
4 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
use std::ops::Deref; | ||
|
||
struct DerefTarget { | ||
target_field: bool, | ||
} | ||
struct Container { | ||
target: DerefTarget, | ||
container_field: bool, | ||
} | ||
|
||
impl Deref for Container { | ||
type Target = DerefTarget; | ||
fn deref(&self) -> &Self::Target { | ||
&self.target | ||
} | ||
} | ||
|
||
impl Container { | ||
fn bad_borrow(&mut self) { | ||
let first = &self.target_field; | ||
self.container_field = true; //~ ERROR E0506 | ||
first; | ||
} | ||
} | ||
|
||
fn main() {} |
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,20 @@ | ||
error[E0506]: cannot assign to `self.container_field` because it is borrowed | ||
--> $DIR/issue-81365-1.rs:21:9 | ||
| | ||
LL | let first = &self.target_field; | ||
| ---- borrow of `self.container_field` occurs here | ||
LL | self.container_field = true; | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.container_field` occurs here | ||
LL | first; | ||
| ----- borrow later used here | ||
| | ||
= note: borrow occurs due to deref coercion to `DerefTarget` | ||
note: deref defined here | ||
--> $DIR/issue-81365-1.rs:12:5 | ||
| | ||
LL | type Target = DerefTarget; | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0506`. |
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,26 @@ | ||
use std::ops::Deref; | ||
|
||
struct DerefTarget { | ||
target_field: bool, | ||
} | ||
struct Container { | ||
target: DerefTarget, | ||
container_field: bool, | ||
} | ||
|
||
impl Deref for Container { | ||
type Target = DerefTarget; | ||
fn deref(&self) -> &Self::Target { | ||
&self.target | ||
} | ||
} | ||
|
||
impl Container { | ||
fn bad_borrow(&mut self) { | ||
let first = &self.deref().target_field; | ||
self.container_field = true; //~ ERROR E0506 | ||
first; | ||
} | ||
} | ||
|
||
fn main() {} |
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,13 @@ | ||
error[E0506]: cannot assign to `self.container_field` because it is borrowed | ||
--> $DIR/issue-81365-10.rs:21:9 | ||
| | ||
LL | let first = &self.deref().target_field; | ||
| ---- borrow of `self.container_field` occurs here | ||
LL | self.container_field = true; | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.container_field` occurs here | ||
LL | first; | ||
| ----- borrow later used here | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0506`. |
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,32 @@ | ||
use std::ops::{Deref, DerefMut}; | ||
|
||
struct DerefTarget { | ||
target_field: bool, | ||
} | ||
struct Container { | ||
target: DerefTarget, | ||
container_field: bool, | ||
} | ||
|
||
impl Deref for Container { | ||
type Target = DerefTarget; | ||
fn deref(&self) -> &Self::Target { | ||
&self.target | ||
} | ||
} | ||
|
||
impl DerefMut for Container { | ||
fn deref_mut(&mut self) -> &mut Self::Target { | ||
&mut self.target | ||
} | ||
} | ||
|
||
impl Container { | ||
fn bad_borrow(&mut self) { | ||
let first = &mut self.target_field; | ||
self.container_field = true; //~ ERROR E0506 | ||
first; | ||
} | ||
} | ||
|
||
fn main() {} |
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,13 @@ | ||
error[E0506]: cannot assign to `self.container_field` because it is borrowed | ||
--> $DIR/issue-81365-11.rs:27:9 | ||
| | ||
LL | let first = &mut self.target_field; | ||
| ---- borrow of `self.container_field` occurs here | ||
LL | self.container_field = true; | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.container_field` occurs here | ||
LL | first; | ||
| ----- borrow later used here | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0506`. |
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,30 @@ | ||
use std::ops::Deref; | ||
|
||
struct DerefTarget { | ||
target_field: bool, | ||
} | ||
struct Container { | ||
target: DerefTarget, | ||
container_field: bool, | ||
} | ||
|
||
impl Deref for Container { | ||
type Target = DerefTarget; | ||
fn deref(&self) -> &Self::Target { | ||
&self.target | ||
} | ||
} | ||
|
||
struct Outer { | ||
container: Container, | ||
} | ||
|
||
impl Outer { | ||
fn bad_borrow(&mut self) { | ||
let first = &self.container.target_field; | ||
self.container.container_field = true; //~ ERROR E0506 | ||
first; | ||
} | ||
} | ||
|
||
fn main() {} |
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,20 @@ | ||
error[E0506]: cannot assign to `self.container.container_field` because it is borrowed | ||
--> $DIR/issue-81365-2.rs:25:9 | ||
| | ||
LL | let first = &self.container.target_field; | ||
| -------------- borrow of `self.container.container_field` occurs here | ||
LL | self.container.container_field = true; | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.container.container_field` occurs here | ||
LL | first; | ||
| ----- borrow later used here | ||
| | ||
= note: borrow occurs due to deref coercion to `DerefTarget` | ||
note: deref defined here | ||
--> $DIR/issue-81365-2.rs:12:5 | ||
| | ||
LL | type Target = DerefTarget; | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0506`. |
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,37 @@ | ||
use std::ops::Deref; | ||
|
||
struct DerefTarget { | ||
target_field: bool, | ||
} | ||
struct Container { | ||
target: DerefTarget, | ||
container_field: bool, | ||
} | ||
|
||
impl Deref for Container { | ||
type Target = DerefTarget; | ||
fn deref(&self) -> &Self::Target { | ||
&self.target | ||
} | ||
} | ||
|
||
struct Outer { | ||
container: Container, | ||
} | ||
|
||
impl Deref for Outer { | ||
type Target = Container; | ||
fn deref(&self) -> &Self::Target { | ||
&self.container | ||
} | ||
} | ||
|
||
impl Outer { | ||
fn bad_borrow(&mut self) { | ||
let first = &self.target_field; | ||
self.container.container_field = true; //~ ERROR E0506 | ||
first; | ||
} | ||
} | ||
|
||
fn main() {} |
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,20 @@ | ||
error[E0506]: cannot assign to `self.container.container_field` because it is borrowed | ||
--> $DIR/issue-81365-3.rs:32:9 | ||
| | ||
LL | let first = &self.target_field; | ||
| ---- borrow of `self.container.container_field` occurs here | ||
LL | self.container.container_field = true; | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.container.container_field` occurs here | ||
LL | first; | ||
| ----- borrow later used here | ||
| | ||
= note: borrow occurs due to deref coercion to `Container` | ||
note: deref defined here | ||
--> $DIR/issue-81365-3.rs:23:5 | ||
| | ||
LL | type Target = Container; | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0506`. |
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,38 @@ | ||
use std::ops::Deref; | ||
|
||
struct DerefTarget { | ||
target_field: bool, | ||
} | ||
struct Container { | ||
target: DerefTarget, | ||
container_field: bool, | ||
} | ||
|
||
impl Deref for Container { | ||
type Target = DerefTarget; | ||
fn deref(&self) -> &Self::Target { | ||
&self.target | ||
} | ||
} | ||
|
||
struct Outer { | ||
container: Container, | ||
outer_field: bool, | ||
} | ||
|
||
impl Deref for Outer { | ||
type Target = Container; | ||
fn deref(&self) -> &Self::Target { | ||
&self.container | ||
} | ||
} | ||
|
||
impl Outer { | ||
fn bad_borrow(&mut self) { | ||
let first = &self.target_field; | ||
self.outer_field = true; //~ ERROR E0506 | ||
first; | ||
} | ||
} | ||
|
||
fn main() {} |
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,20 @@ | ||
error[E0506]: cannot assign to `self.outer_field` because it is borrowed | ||
--> $DIR/issue-81365-4.rs:33:9 | ||
| | ||
LL | let first = &self.target_field; | ||
| ---- borrow of `self.outer_field` occurs here | ||
LL | self.outer_field = true; | ||
| ^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `self.outer_field` occurs here | ||
LL | first; | ||
| ----- borrow later used here | ||
| | ||
= note: borrow occurs due to deref coercion to `Container` | ||
note: deref defined here | ||
--> $DIR/issue-81365-4.rs:24:5 | ||
| | ||
LL | type Target = Container; | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0506`. |
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,33 @@ | ||
use std::ops::Deref; | ||
|
||
struct DerefTarget { | ||
target_field: bool, | ||
} | ||
|
||
impl DerefTarget { | ||
fn get(&self) -> &bool { | ||
&self.target_field | ||
} | ||
} | ||
|
||
struct Container { | ||
target: DerefTarget, | ||
container_field: bool, | ||
} | ||
|
||
impl Deref for Container { | ||
type Target = DerefTarget; | ||
fn deref(&self) -> &Self::Target { | ||
&self.target | ||
} | ||
} | ||
|
||
impl Container { | ||
fn bad_borrow(&mut self) { | ||
let first = self.get(); | ||
self.container_field = true; //~ ERROR E0506 | ||
first; | ||
} | ||
} | ||
|
||
fn main() {} |
Oops, something went wrong.