forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 7
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 rust-lang#124599 - estebank:issue-41708, r=wesleywiser Suggest borrowing on fn argument that is `impl AsRef` When encountering a move conflict, on an expression that is `!Copy` passed as an argument to an `fn` that is `impl AsRef`, suggest borrowing the expression. ``` error[E0382]: use of moved value: `bar` --> f204.rs:14:15 | 12 | let bar = Bar; | --- move occurs because `bar` has type `Bar`, which does not implement the `Copy` trait 13 | foo(bar); | --- value moved here 14 | let baa = bar; | ^^^ value used here after move | help: borrow the value to avoid moving it | 13 | foo(&bar); | + ``` Fix rust-lang#41708
- Loading branch information
Showing
5 changed files
with
224 additions
and
19 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
//@ run-rustfix | ||
#![allow(unused_mut)] | ||
use std::borrow::{Borrow, BorrowMut}; | ||
use std::convert::{AsMut, AsRef}; | ||
struct Bar; | ||
|
||
impl AsRef<Bar> for Bar { | ||
fn as_ref(&self) -> &Bar { | ||
self | ||
} | ||
} | ||
|
||
impl AsMut<Bar> for Bar { | ||
fn as_mut(&mut self) -> &mut Bar { | ||
self | ||
} | ||
} | ||
|
||
fn foo<T: AsRef<Bar>>(_: T) {} | ||
fn qux<T: AsMut<Bar>>(_: T) {} | ||
fn bat<T: Borrow<T>>(_: T) {} | ||
fn baz<T: BorrowMut<T>>(_: T) {} | ||
|
||
pub fn main() { | ||
let bar = Bar; | ||
foo(&bar); | ||
let _baa = bar; //~ ERROR use of moved value | ||
let mut bar = Bar; | ||
qux(&mut bar); | ||
let _baa = bar; //~ ERROR use of moved value | ||
let bar = Bar; | ||
bat(&bar); | ||
let _baa = bar; //~ ERROR use of moved value | ||
let mut bar = Bar; | ||
baz(&mut bar); | ||
let _baa = bar; //~ ERROR use of moved value | ||
} |
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 @@ | ||
//@ run-rustfix | ||
#![allow(unused_mut)] | ||
use std::borrow::{Borrow, BorrowMut}; | ||
use std::convert::{AsMut, AsRef}; | ||
struct Bar; | ||
|
||
impl AsRef<Bar> for Bar { | ||
fn as_ref(&self) -> &Bar { | ||
self | ||
} | ||
} | ||
|
||
impl AsMut<Bar> for Bar { | ||
fn as_mut(&mut self) -> &mut Bar { | ||
self | ||
} | ||
} | ||
|
||
fn foo<T: AsRef<Bar>>(_: T) {} | ||
fn qux<T: AsMut<Bar>>(_: T) {} | ||
fn bat<T: Borrow<T>>(_: T) {} | ||
fn baz<T: BorrowMut<T>>(_: T) {} | ||
|
||
pub fn main() { | ||
let bar = Bar; | ||
foo(bar); | ||
let _baa = bar; //~ ERROR use of moved value | ||
let mut bar = Bar; | ||
qux(bar); | ||
let _baa = bar; //~ ERROR use of moved value | ||
let bar = Bar; | ||
bat(bar); | ||
let _baa = bar; //~ ERROR use of moved value | ||
let mut bar = Bar; | ||
baz(bar); | ||
let _baa = bar; //~ ERROR use of moved value | ||
} |
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,79 @@ | ||
error[E0382]: use of moved value: `bar` | ||
--> $DIR/moved-value-on-as-ref-arg.rs:27:16 | ||
| | ||
LL | let bar = Bar; | ||
| --- move occurs because `bar` has type `Bar`, which does not implement the `Copy` trait | ||
LL | foo(bar); | ||
| --- value moved here | ||
LL | let _baa = bar; | ||
| ^^^ value used here after move | ||
| | ||
help: borrow the value to avoid moving it | ||
| | ||
LL | foo(&bar); | ||
| + | ||
|
||
error[E0382]: use of moved value: `bar` | ||
--> $DIR/moved-value-on-as-ref-arg.rs:30:16 | ||
| | ||
LL | let mut bar = Bar; | ||
| ------- move occurs because `bar` has type `Bar`, which does not implement the `Copy` trait | ||
LL | qux(bar); | ||
| --- value moved here | ||
LL | let _baa = bar; | ||
| ^^^ value used here after move | ||
| | ||
note: if `Bar` implemented `Clone`, you could clone the value | ||
--> $DIR/moved-value-on-as-ref-arg.rs:5:1 | ||
| | ||
LL | struct Bar; | ||
| ^^^^^^^^^^ consider implementing `Clone` for this type | ||
... | ||
LL | qux(bar); | ||
| --- you could clone this value | ||
help: borrow the value to avoid moving it | ||
| | ||
LL | qux(&mut bar); | ||
| ++++ | ||
|
||
error[E0382]: use of moved value: `bar` | ||
--> $DIR/moved-value-on-as-ref-arg.rs:33:16 | ||
| | ||
LL | let bar = Bar; | ||
| --- move occurs because `bar` has type `Bar`, which does not implement the `Copy` trait | ||
LL | bat(bar); | ||
| --- value moved here | ||
LL | let _baa = bar; | ||
| ^^^ value used here after move | ||
| | ||
help: borrow the value to avoid moving it | ||
| | ||
LL | bat(&bar); | ||
| + | ||
|
||
error[E0382]: use of moved value: `bar` | ||
--> $DIR/moved-value-on-as-ref-arg.rs:36:16 | ||
| | ||
LL | let mut bar = Bar; | ||
| ------- move occurs because `bar` has type `Bar`, which does not implement the `Copy` trait | ||
LL | baz(bar); | ||
| --- value moved here | ||
LL | let _baa = bar; | ||
| ^^^ value used here after move | ||
| | ||
note: if `Bar` implemented `Clone`, you could clone the value | ||
--> $DIR/moved-value-on-as-ref-arg.rs:5:1 | ||
| | ||
LL | struct Bar; | ||
| ^^^^^^^^^^ consider implementing `Clone` for this type | ||
... | ||
LL | baz(bar); | ||
| --- you could clone this value | ||
help: borrow the value to avoid moving it | ||
| | ||
LL | baz(&mut bar); | ||
| ++++ | ||
|
||
error: aborting due to 4 previous errors | ||
|
||
For more information about this error, try `rustc --explain E0382`. |