-
Notifications
You must be signed in to change notification settings - Fork 13.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add suggestions for function pointers
- On compiler-error's suggestion of moving this lower down the stack, along the path of `report_mismatched_types()`, which is used by `rustc_hir_analysis` and `rustc_hir_typeck`. - update ui tests, add test - add suggestions for references to fn pointers - modify `TypeErrCtxt::same_type_modulo_infer` to take `T: relate::Relate` instead of `Ty`
- Loading branch information
1 parent
c8e6a9e
commit 1e22280
Showing
14 changed files
with
273 additions
and
96 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
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
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,53 +1,52 @@ | ||
| // Test that the types of distinct fn items are not compatible by | ||
| // default. See also `run-pass/fn-item-type-*.rs`. | ||
|
|
||
| fn foo<T>(x: isize) -> isize { x * 2 } | ||
| fn bar<T>(x: isize) -> isize { x * 4 } | ||
| fn foo<T>(x: isize) -> isize { | ||
| x * 2 | ||
| } | ||
| fn bar<T>(x: isize) -> isize { | ||
| x * 4 | ||
| } | ||
|
|
||
| fn eq<T>(x: T, y: T) { } | ||
| fn eq<T>(x: T, y: T) {} | ||
|
|
||
| trait Foo { fn foo() { /* this is a default fn */ } } | ||
| impl<T> Foo for T { /* `foo` is still default here */ } | ||
| trait Foo { | ||
| fn foo() { /* this is a default fn */ | ||
| } | ||
| } | ||
| impl<T> Foo for T { | ||
| /* `foo` is still default here */ | ||
| } | ||
|
|
||
| fn main() { | ||
| eq(foo::<u8>, bar::<u8>); | ||
| //~^ ERROR mismatched types | ||
| //~| expected fn item `fn(_) -> _ {foo::<u8>}` | ||
| //~| found fn item `fn(_) -> _ {bar::<u8>}` | ||
| //~| expected fn item, found a different fn item | ||
| //~| different `fn` items always have unique types, even if their signatures are the same | ||
| //~| change the expected type to be function pointer | ||
| //~| if the expected type is due to type inference, cast the expected `fn` to a function pointer | ||
| //~| different fn items have unique types, even if their signatures are the same | ||
|
|
||
| eq(foo::<u8>, foo::<i8>); | ||
| //~^ ERROR mismatched types | ||
| //~| expected `u8`, found `i8` | ||
| //~| different `fn` items always have unique types, even if their signatures are the same | ||
| //~| change the expected type to be function pointer | ||
| //~| if the expected type is due to type inference, cast the expected `fn` to a function pointer | ||
| //~| different fn items have unique types, even if their signatures are the same | ||
|
|
||
| eq(bar::<String>, bar::<Vec<u8>>); | ||
| //~^ ERROR mismatched types | ||
| //~| found fn item `fn(_) -> _ {bar::<Vec<u8>>}` | ||
| //~| expected struct `String`, found struct `Vec` | ||
| //~| different `fn` items always have unique types, even if their signatures are the same | ||
| //~| change the expected type to be function pointer | ||
| //~| if the expected type is due to type inference, cast the expected `fn` to a function pointer | ||
| //~| different fn items have unique types, even if their signatures are the same | ||
|
|
||
| // Make sure we distinguish between trait methods correctly. | ||
| eq(<u8 as Foo>::foo, <u16 as Foo>::foo); | ||
| //~^ ERROR mismatched types | ||
| //~| expected `u8`, found `u16` | ||
| //~| different `fn` items always have unique types, even if their signatures are the same | ||
| //~| change the expected type to be function pointer | ||
| //~| if the expected type is due to type inference, cast the expected `fn` to a function pointer | ||
| //~| different fn items have unique types, even if their signatures are the same | ||
|
|
||
| eq(foo::<u8>, bar::<u8> as fn(isize) -> isize); | ||
| //~^ ERROR mismatched types | ||
| //~| found fn pointer `fn(_) -> _` | ||
| //~| expected fn item, found fn pointer | ||
| //~| change the expected type to be function pointer | ||
| //~| if the expected type is due to type inference, cast the expected `fn` to a function pointer | ||
|
|
||
| eq(foo::<u8> as fn(isize) -> isize, bar::<u8>); // ok! | ||
| } |
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
Oops, something went wrong.