[Distributed] More descriptive kind usage for error messages

Author: ktoso

include/swift/AST/DiagnosticsSema.def

@@ -4508,10 +4508,10 @@ ERROR(distributed_actor_func_param_not_codable,none,
       "distributed instance method parameter '%0' of type %1 does not conform to 'Codable'",
       (StringRef, Type))
 ERROR(distributed_actor_func_result_not_codable,none,
-      "distributed instance method result type %0 does not conform to 'Codable'",
-      (Type))
+      "%0 result type %0 does not conform to 'Codable'",
+      (DescriptiveDeclKind, Type))
 ERROR(distributed_actor_remote_func_implemented_manually,none,
-      "distributed function's %0 remote counterpart %1 cannot not be implemented manually.",
+      "distributed instance method's %0 remote counterpart %1 cannot not be implemented manually.",
       (Identifier, Identifier))
 ERROR(nonisolated_distributed_actor_storage,none,
       "'nonisolated' can not be applied to distributed actor stored properties",
@@ -4532,7 +4532,7 @@ ERROR(distributed_actor_func_variadic, none,
       "%0 %1 cannot declare variadic argument %2",
       (DescriptiveDeclKind, DeclName, DeclName))
 ERROR(distributed_actor_remote_func_is_not_static,none,
-      "remote function %0 must be static.",
+      "remote function %0 must be static",
       (DeclName))
 ERROR(distributed_actor_remote_func_is_not_async_throws,none,
       "remote function %0 must be 'async throws'.",

lib/Sema/TypeCheckDistributed.cpp

@@ -155,6 +155,7 @@ bool swift::checkDistributedFunction(FuncDecl *func, bool diagnose) {
       if (diagnose)
         func->diagnose(
             diag::distributed_actor_func_result_not_codable,
+            func->getDescriptiveKind(),
             func->getResultInterfaceType()
         );
       // TODO: suggest a fixit to add Codable to the type?

test/Distributed/distributed_actor_inference.swift

@@ -68,9 +68,9 @@ distributed actor SomeDistributedActor_6 {
 
 @available(SwiftStdlib 5.6, *)
 distributed actor SomeDistributedActor_7 {
-  distributed func dont_1() async throws -> Int { 42 } // expected-error{{distributed instance method's'dont_1' remote counterpart '_remote_dont_1' cannot not be implemented manually.}}
-  distributed func dont_2() async throws -> Int { 42 } // expected-error{{distributed instance method's'dont_2' remote counterpart '_remote_dont_2' cannot not be implemented manually.}}
-  distributed func dont_3() async throws -> Int { 42 } // expected-error{{distributed instance method's'dont_3' remote counterpart '_remote_dont_3' cannot not be implemented manually.}}
+  distributed func dont_1() async throws -> Int { 42 } // expected-error{{distributed instance method's 'dont_1' remote counterpart '_remote_dont_1' cannot not be implemented manually.}}
+  distributed func dont_2() async throws -> Int { 42 } // expected-error{{distributed instance method's 'dont_2' remote counterpart '_remote_dont_2' cannot not be implemented manually.}}
+  distributed func dont_3() async throws -> Int { 42 } // expected-error{{distributed instance method's 'dont_3' remote counterpart '_remote_dont_3' cannot not be implemented manually.}}
 }
 
 @available(SwiftStdlib 5.6, *)