forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 6
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#128337 - bvanjoi:issue-121613, r=compiler-errors skip assoc type during infer source visitor Fixes rust-lang#121613 Due to the generic arguments being lost during normalization, the associated type cannot retrieve the correct generics information, so this PR follows this [comment](https://github.com/rust-lang/rust/blob/master/compiler/rustc_trait_selection/src/error_reporting/infer/need_type_info.rs#L937-L942) and skips `DefKind::AssocTy` r? `@lcnr`
- Loading branch information
Showing
7 changed files
with
120 additions
and
56 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 was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
24 changes: 24 additions & 0 deletions
24
tests/ui/inference/need_type_info/incompat-call-after-qualified-path-0.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,24 @@ | ||
// issue#121613 | ||
|
||
#![feature(more_qualified_paths)] | ||
|
||
struct S {} | ||
|
||
struct Foo; | ||
|
||
trait A { | ||
type Assoc; | ||
} | ||
|
||
impl A for Foo { | ||
type Assoc = S; | ||
} | ||
|
||
fn f() {} | ||
|
||
fn main() { | ||
<Foo as A>::Assoc {}; | ||
f(|a, b| a.cmp(b)); | ||
//~^ ERROR: type annotations needed | ||
//~| ERROR: this function takes 0 arguments but 1 argument was supplied | ||
} |
32 changes: 32 additions & 0 deletions
32
tests/ui/inference/need_type_info/incompat-call-after-qualified-path-0.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,32 @@ | ||
error[E0282]: type annotations needed | ||
--> $DIR/incompat-call-after-qualified-path-0.rs:21:6 | ||
| | ||
LL | f(|a, b| a.cmp(b)); | ||
| ^ - type must be known at this point | ||
| | ||
help: consider giving this closure parameter an explicit type | ||
| | ||
LL | f(|a: /* Type */, b| a.cmp(b)); | ||
| ++++++++++++ | ||
|
||
error[E0061]: this function takes 0 arguments but 1 argument was supplied | ||
--> $DIR/incompat-call-after-qualified-path-0.rs:21:3 | ||
| | ||
LL | f(|a, b| a.cmp(b)); | ||
| ^ --------------- unexpected argument | ||
| | ||
note: function defined here | ||
--> $DIR/incompat-call-after-qualified-path-0.rs:17:4 | ||
| | ||
LL | fn f() {} | ||
| ^ | ||
help: remove the extra argument | ||
| | ||
LL - f(|a, b| a.cmp(b)); | ||
LL + f(); | ||
| | ||
|
||
error: aborting due to 2 previous errors | ||
|
||
Some errors have detailed explanations: E0061, E0282. | ||
For more information about an error, try `rustc --explain E0061`. |
28 changes: 28 additions & 0 deletions
28
tests/ui/inference/need_type_info/incompat-call-after-qualified-path-1.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,28 @@ | ||
// issue#121613 | ||
|
||
#![feature(more_qualified_paths)] | ||
|
||
struct S<T> { | ||
a: T | ||
} | ||
|
||
struct Foo; | ||
|
||
trait A { | ||
type Assoc<T>; | ||
} | ||
|
||
impl A for Foo { | ||
type Assoc<T> = S<T>; | ||
} | ||
|
||
fn f() {} | ||
|
||
fn main() { | ||
<Foo as A>::Assoc::<i32> { | ||
a: 1 | ||
}; | ||
f(|a, b| a.cmp(b)); | ||
//~^ ERROR: type annotations needed | ||
//~| ERROR: this function takes 0 arguments but 1 argument was supplied | ||
} |
32 changes: 32 additions & 0 deletions
32
tests/ui/inference/need_type_info/incompat-call-after-qualified-path-1.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,32 @@ | ||
error[E0282]: type annotations needed | ||
--> $DIR/incompat-call-after-qualified-path-1.rs:25:6 | ||
| | ||
LL | f(|a, b| a.cmp(b)); | ||
| ^ - type must be known at this point | ||
| | ||
help: consider giving this closure parameter an explicit type | ||
| | ||
LL | f(|a: /* Type */, b| a.cmp(b)); | ||
| ++++++++++++ | ||
|
||
error[E0061]: this function takes 0 arguments but 1 argument was supplied | ||
--> $DIR/incompat-call-after-qualified-path-1.rs:25:3 | ||
| | ||
LL | f(|a, b| a.cmp(b)); | ||
| ^ --------------- unexpected argument | ||
| | ||
note: function defined here | ||
--> $DIR/incompat-call-after-qualified-path-1.rs:19:4 | ||
| | ||
LL | fn f() {} | ||
| ^ | ||
help: remove the extra argument | ||
| | ||
LL - f(|a, b| a.cmp(b)); | ||
LL + f(); | ||
| | ||
|
||
error: aborting due to 2 previous errors | ||
|
||
Some errors have detailed explanations: E0061, E0282. | ||
For more information about an error, try `rustc --explain E0061`. |