fix rebase; remove duped type

Author: ktoso

lib/Sema/TypeCheckDistributed.cpp

@@ -447,8 +447,6 @@ bool swift::checkDistributedActorSystem(const NominalTypeDecl *system) {
   // work to enable associatedtypes to be constrained to class or protocol,
   // which then will unlock using them as generic constraints in protocols.
   Type requirementTy = getDistributedSerializationRequirementType(nominal, DAS);
-  requirementTy->dump();
-
   if (auto existentialTy = requirementTy->getAs<ExistentialType>()) {
     requirementTy = existentialTy->getConstraintType();
   }

test/Distributed/distributed_actor_system_missing_adhoc_requirement_impls.swift

@@ -41,67 +41,6 @@ struct MissingRemoteCall: DistributedActorSystem {
   }
 }
 
-struct MissingRemoteCall_missingInout_on_encoder: DistributedActorSystem {
-  // expected-error@-1{{struct 'MissingRemoteCall_missingInout_on_encoder' is missing witness for protocol requirement 'remoteCall'}}
-  // expected-note@-2{{protocol 'MissingRemoteCall_missingInout_on_encoder' requires function 'remoteCall' with signature:}}
-
-  // expected-error@-4{{struct 'MissingRemoteCall_missingInout_on_encoder' is missing witness for protocol requirement 'remoteCallVoid'}}
-  // expected-note@-5{{protocol 'MissingRemoteCall_missingInout_on_encoder' requires function 'remoteCallVoid' with signature:}}
-
-  typealias ActorID = ActorAddress
-  typealias InvocationDecoder = FakeInvocationDecoder
-  typealias InvocationEncoder = FakeInvocationEncoder
-  typealias SerializationRequirement = Codable
-  typealias ResultHandler = FakeResultHandler
-
-  func resolve<Act>(id: ActorID, as actorType: Act.Type)
-    throws -> Act? where Act: DistributedActor {
-    return nil
-  }
-
-  func assignID<Act>(_ actorType: Act.Type) -> ActorID
-    where Act: DistributedActor {
-    ActorAddress(parse: "fake://123")
-  }
-
-  func actorReady<Act>(_ actor: Act)
-    where Act: DistributedActor,
-    Act.ID == ActorID {
-  }
-
-  func resignID(_ id: ActorID) {
-  }
-
-  func remoteCall<Act, Err, Res>(
-      on actor: Act,
-      target: RemoteCallTarget,
-      invocation: InvocationEncoder, // MISSING 'inout'
-      throwing: Err.Type,
-      returning: Res.Type
-  ) async throws -> Res
-      where Act: DistributedActor,
-      Act.ID == ActorID,
-      Err: Error,
-      Res: SerializationRequirement {
-    fatalError("NOT IMPLEMENTED \(#function)")
-  }
-
-  func remoteCallVoid<Act, Err>(
-      on actor: Act,
-      target: RemoteCallTarget,
-      invocation: InvocationEncoder, // MISSING 'inout'
-      throwing: Err.Type
-  ) async throws
-      where Act: DistributedActor,
-      Act.ID == ActorID,
-      Err: Error {
-    fatalError("NOT IMPLEMENTED \(#function)")
-  }
-
-  func makeInvocationEncoder() -> InvocationEncoder {
-  }
-}
-
 struct RemoteCallMutating: DistributedActorSystem {
   // expected-error@-1{{struct 'RemoteCallMutating' is missing witness for protocol requirement 'remoteCall'}}
   // expected-note@-2{{protocol 'DistributedActorSystem' requires function 'remoteCall' with signature:}}

test/Distributed/distributed_serializationRequirement_must_be_protocol.swift

@@ -16,9 +16,9 @@ final class SomeEnum: Sendable {}
 final class System: DistributedActorSystem {
   // ignore those since they all fail with the SerializationRequirement being invalid:
   // expected-error@-2{{type 'System' does not conform to protocol 'DistributedActorSystem'}}
-  // expected-note@-3{{protocol 'System' requires function 'remoteCallVoid'}}
+  // expected-note@-3{{protocol 'DistributedActorSystem' requires function 'remoteCallVoid'}}
   // expected-error@-4{{class 'System' is missing witness for protocol requirement 'remoteCall'}}
-  // expected-note@-5{{protocol 'System' requires function 'remoteCall' with signature:}}
+  // expected-note@-5{{protocol 'DistributedActorSystem' requires function 'remoteCall' with signature:}}
   // expected-error@-6{{class 'System' is missing witness for protocol requirement 'remoteCallVoid'}}
   typealias ActorID = String
   typealias InvocationEncoder = ClassInvocationEncoder
@@ -81,9 +81,9 @@ final class System: DistributedActorSystem {
 }
 
 struct ClassInvocationEncoder: DistributedTargetInvocationEncoder {
-  // expected-note@-1{{protocol 'ClassInvocationEncoder' requires function 'recordArgument' with signature:}}
+  // expected-note@-1{{protocol 'DistributedTargetInvocationEncoder' requires function 'recordArgument' with signature:}}
   // expected-error@-2{{struct 'ClassInvocationEncoder' is missing witness for protocol requirement 'recordArgument'}}
-  // expected-note@-3{{protocol 'ClassInvocationEncoder' requires function 'recordReturnType' with signature:}}
+  // expected-note@-3{{protocol 'DistributedTargetInvocationEncoder' requires function 'recordReturnType' with signature:}}
   // expected-error@-4{{struct 'ClassInvocationEncoder' is missing witness for protocol requirement 'recordReturnType'}}
   typealias SerializationRequirement = SomeClazz
 
@@ -97,7 +97,7 @@ struct ClassInvocationEncoder: DistributedTargetInvocationEncoder {
 
 final class ClassInvocationDecoder: DistributedTargetInvocationDecoder {
   // expected-error@-1{{class 'ClassInvocationDecoder' is missing witness for protocol requirement 'decodeNextArgument'}}
-  // expected-note@-2{{protocol 'ClassInvocationDecoder' requires function 'decodeNextArgument'}}
+  // expected-note@-2{{protocol 'DistributedTargetInvocationDecoder' requires function 'decodeNextArgument'}}
   typealias SerializationRequirement = SomeClazz
 
   public func decodeGenericSubstitutions() throws -> [Any.Type] {