forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
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#106363 - estebank:mutability-mismatch-arg, …
…r=Nilstrieb Structured suggestion for `&mut dyn Iterator` when possible Fix rust-lang#37914.
- Loading branch information
Showing
9 changed files
with
91 additions
and
30 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
9 changes: 9 additions & 0 deletions
9
src/test/ui/illegal-sized-bound/mutability-mismatch-arg.fixed
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,9 @@ | ||
// run-rustfix | ||
fn test(t: &mut dyn Iterator<Item=&u64>) -> u64 { | ||
*t.min().unwrap() //~ ERROR the `min` method cannot be invoked on | ||
} | ||
|
||
fn main() { | ||
let array = [0u64]; | ||
test(&mut array.iter()); | ||
} |
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,9 @@ | ||
// run-rustfix | ||
fn test(t: &dyn Iterator<Item=&u64>) -> u64 { | ||
*t.min().unwrap() //~ ERROR the `min` method cannot be invoked on | ||
} | ||
|
||
fn main() { | ||
let array = [0u64]; | ||
test(&mut array.iter()); | ||
} |
13 changes: 13 additions & 0 deletions
13
src/test/ui/illegal-sized-bound/mutability-mismatch-arg.stderr
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: the `min` method cannot be invoked on `&dyn Iterator<Item = &u64>` | ||
--> $DIR/mutability-mismatch-arg.rs:3:9 | ||
| | ||
LL | *t.min().unwrap() | ||
| ^^^ | ||
| | ||
help: you need `&mut dyn Iterator<Item = &u64>` instead of `&dyn Iterator<Item = &u64>` | ||
| | ||
LL | fn test(t: &mut dyn Iterator<Item=&u64>) -> u64 { | ||
| +++ | ||
|
||
error: aborting due to previous error | ||
|
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
18 changes: 6 additions & 12 deletions
18
src/test/ui/illegal-sized-bound/mutability-mismatch.stderr
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 |
---|---|---|
@@ -1,24 +1,18 @@ | ||
error: the `function` method cannot be invoked on a trait object | ||
--> $DIR/mutability-mismatch.rs:28:33 | ||
error: the `function` method cannot be invoked on `&dyn MutTrait` | ||
--> $DIR/mutability-mismatch.rs:26:33 | ||
| | ||
LL | Self: Sized; | ||
| ----- this has a `Sized` requirement | ||
... | ||
LL | (&MutType as &dyn MutTrait).function(); | ||
| ^^^^^^^^ | ||
| | ||
= note: you need `&mut dyn MutTrait` instead of `&dyn MutTrait` | ||
= help: you need `&mut dyn MutTrait` instead of `&dyn MutTrait` | ||
|
||
error: the `function` method cannot be invoked on a trait object | ||
--> $DIR/mutability-mismatch.rs:31:35 | ||
error: the `function` method cannot be invoked on `&mut dyn Trait` | ||
--> $DIR/mutability-mismatch.rs:29:35 | ||
| | ||
LL | Self: Sized; | ||
| ----- this has a `Sized` requirement | ||
... | ||
LL | (&mut Type as &mut dyn Trait).function(); | ||
| ^^^^^^^^ | ||
| | ||
= note: you need `&dyn Trait` instead of `&mut dyn Trait` | ||
= help: you need `&dyn Trait` instead of `&mut dyn Trait` | ||
|
||
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
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 |
---|---|---|
@@ -1,13 +1,13 @@ | ||
error: the `min` method cannot be invoked on a trait object | ||
error: the `min` method cannot be invoked on `&dyn Iterator<Item = &u64>` | ||
--> $DIR/imm-ref-trait-object.rs:2:8 | ||
| | ||
LL | t.min().unwrap() | ||
| ^^^ | ||
--> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL | ||
| | ||
= note: this has a `Sized` requirement | ||
help: you need `&mut dyn Iterator<Item = &u64>` instead of `&dyn Iterator<Item = &u64>` | ||
| | ||
= note: you need `&mut dyn Iterator<Item = &u64>` instead of `&dyn Iterator<Item = &u64>` | ||
LL | fn test(t: &mut dyn Iterator<Item=&u64>) -> u64 { | ||
| +++ | ||
|
||
error: aborting due to previous error | ||
|