Skip to content

[Sema] Fix Issue #63291 by aligning error messages for failure to infer generic parameter and opaque result type #63567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 13, 2023
Merged

[Sema] Fix Issue #63291 by aligning error messages for failure to infer generic parameter and opaque result type #63567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/swift/AST/DiagnosticsSema.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3918,7 +3918,7 @@ ERROR(unresolved_member_no_inference,none,
ERROR(cannot_infer_base_of_unresolved_member,none,
"cannot infer contextual base in reference to member %0", (DeclNameRef))
ERROR(cannot_infer_underlying_for_opaque_result,none,
"cannot infer underlying type for opaque result %0 from return expression",
"underlying type for opaque result type %0 could not be inferred from return expression",
(Type))
ERROR(unresolved_nil_literal,none,
"'nil' requires a contextual type", ())
Expand Down
6 changes: 3 additions & 3 deletions test/type/opaque.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,12 +581,12 @@ do {

// https://github.com/apple/swift/issues/62787
func f62787() -> Optional<some Collection<Int>> {
return nil // expected-error{{cannot infer underlying type for opaque result 'Optional<some Collection<Int>>' from return expression}}
return nil // expected-error{{underlying type for opaque result type 'Optional<some Collection<Int>>' could not be inferred from return expression}}
}

func f62787_1(x: Bool) -> Optional<some Collection<Int>> {
if x {
return nil // expected-error{{cannot infer underlying type for opaque result 'Optional<some Collection<Int>>' from return expression}}
return nil // expected-error{{underlying type for opaque result type 'Optional<some Collection<Int>>' could not be inferred from return expression}}
}
return nil // expected-error{{cannot infer underlying type for opaque result 'Optional<some Collection<Int>>' from return expression}}
return nil // expected-error{{underlying type for opaque result type 'Optional<some Collection<Int>>' could not be inferred from return expression}}
}
4 changes: 2 additions & 2 deletions test/type/opaque_return_named.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
// Tests for experimental extensions to opaque return type support.

func f0() -> <T> T { return () }
func f1() -> <T, U, V> T { () } // expected-error{{cannot infer underlying type for opaque result 'T' from return expression}}
func f1() -> <T, U, V> T { () } // expected-error{{underlying type for opaque result type 'T' could not be inferred from return expression}}
func f2() -> <T: Collection, U: SignedInteger> T { // expected-note{{required by opaque return type of global function 'f2()'}}
() // expected-error{{type '()' cannot conform to 'Collection'}}
// expected-note@-1{{only concrete types such as structs, enums and classes can conform to protocols}}
// expected-error@-2{{cannot infer underlying type for opaque result 'T' from return expression}}
// expected-error@-2{{underlying type for opaque result type 'T' could not be inferred from return expression}}
}

func f4() async -> <T> T { () }
Expand Down