-
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 #128377 - veera-sivarajan:fix-128249, r=davidtwco
Fix ICE Caused by Incorrectly Delaying E0107 Fixes #128249 For the following code: ```rust trait Foo<T> {} impl Foo<T: Default> for u8 {} ``` #126054 added some logic to delay emitting E0107 as the names of associated type `T` in the impl header and generic parameter `T` in `trait Foo` match. But it failed to ensure whether such unexpected associated type bounds are coming from a impl block header. This caused an ICE as the compiler was delaying E0107 for code like: ```rust trait Trait<Type> { type Type; fn method(&self) -> impl Trait<Type: '_>; } ``` because it assumed the associated type bound `Type: '_` is for the generic parameter `Type` in `trait Trait` since the names are same. This PR adds a check to ensure that E0107 is delayed only in the context of impl block header.
- Loading branch information
Showing
4 changed files
with
98 additions
and
14 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
15 changes: 15 additions & 0 deletions
15
tests/ui/associated-type-bounds/name-same-as-generic-type-issue-128249.rs
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,15 @@ | ||
trait Trait<Type> { | ||
type Type; | ||
|
||
fn one(&self, val: impl Trait<Type: Default>); | ||
//~^ ERROR trait takes 1 generic argument but 0 generic arguments were supplied | ||
|
||
fn two<T: Trait<Type: Default>>(&self) -> T; | ||
//~^ ERROR trait takes 1 generic argument but 0 generic arguments were supplied | ||
|
||
fn three<T>(&self) -> T where | ||
T: Trait<Type: Default>,; | ||
//~^ ERROR trait takes 1 generic argument but 0 generic arguments were supplied | ||
} | ||
|
||
fn main() {} |
51 changes: 51 additions & 0 deletions
51
tests/ui/associated-type-bounds/name-same-as-generic-type-issue-128249.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,51 @@ | ||
error[E0107]: trait takes 1 generic argument but 0 generic arguments were supplied | ||
--> $DIR/name-same-as-generic-type-issue-128249.rs:4:30 | ||
| | ||
LL | fn one(&self, val: impl Trait<Type: Default>); | ||
| ^^^^^ expected 1 generic argument | ||
| | ||
note: trait defined here, with 1 generic parameter: `Type` | ||
--> $DIR/name-same-as-generic-type-issue-128249.rs:1:7 | ||
| | ||
LL | trait Trait<Type> { | ||
| ^^^^^ ---- | ||
help: add missing generic argument | ||
| | ||
LL | fn one(&self, val: impl Trait<Type, Type: Default>); | ||
| +++++ | ||
|
||
error[E0107]: trait takes 1 generic argument but 0 generic arguments were supplied | ||
--> $DIR/name-same-as-generic-type-issue-128249.rs:7:15 | ||
| | ||
LL | fn two<T: Trait<Type: Default>>(&self) -> T; | ||
| ^^^^^ expected 1 generic argument | ||
| | ||
note: trait defined here, with 1 generic parameter: `Type` | ||
--> $DIR/name-same-as-generic-type-issue-128249.rs:1:7 | ||
| | ||
LL | trait Trait<Type> { | ||
| ^^^^^ ---- | ||
help: add missing generic argument | ||
| | ||
LL | fn two<T: Trait<Type, Type: Default>>(&self) -> T; | ||
| +++++ | ||
|
||
error[E0107]: trait takes 1 generic argument but 0 generic arguments were supplied | ||
--> $DIR/name-same-as-generic-type-issue-128249.rs:11:12 | ||
| | ||
LL | T: Trait<Type: Default>,; | ||
| ^^^^^ expected 1 generic argument | ||
| | ||
note: trait defined here, with 1 generic parameter: `Type` | ||
--> $DIR/name-same-as-generic-type-issue-128249.rs:1:7 | ||
| | ||
LL | trait Trait<Type> { | ||
| ^^^^^ ---- | ||
help: add missing generic argument | ||
| | ||
LL | T: Trait<Type, Type: Default>,; | ||
| +++++ | ||
|
||
error: aborting due to 3 previous errors | ||
|
||
For more information about this error, try `rustc --explain E0107`. |