Test: fold together similar NCGenerics tests

(cherry picked from commit 341ff24)

Author: kavon

test/Constraints/moveonly_constraints.swift

@@ -1,3 +1,4 @@
+// RUN: %target-typecheck-verify-swift
 // RUN: %target-typecheck-verify-swift -enable-experimental-feature NoncopyableGenerics
 
 // a concrete move-only type
@@ -289,31 +290,3 @@ func doBadMetatypeStuff<T>(_ t: T) {
 func tryToDoBadMetatypeStuff() {
   doBadMetatypeStuff(MO.self)
 }
-
-func totallyInvalid<T>(_ t: T) where MO: ~Copyable {}
-// expected-error@-1{{type 'MO' in conformance requirement does not refer to a generic parameter or associated type}}
-
-func packingHeat<each T>(_ t: repeat each T) {} // expected-note {{generic parameter 'each T' has an implicit Copyable requirement}}
-func packIt() {
-  packingHeat(MO())  // expected-error {{noncopyable type 'MO' cannot be substituted for copyable generic parameter 'each T' in 'packingHeat'}}
-  packingHeat(10)
-}
-
-func packingUniqueHeat_1<each T: ~Copyable>(_ t: repeat each T) {}
-// expected-error@-1{{cannot apply inverse '~Copyable' to type 'each T' in conformance requirement}}
-// expected-note@-2{{generic parameter 'each T' has an implicit Copyable requirement}}
-
-func packingUniqueHeat_2<each T>(_ t: repeat each T)
-   where repeat each T: ~Copyable {}
-// expected-error@-1{{cannot apply inverse '~Copyable' to type 'each T' in conformance requirement}}
-// expected-note@-3{{generic parameter 'each T' has an implicit Copyable requirement}}
-
-func packItUniquely() {
-  packingUniqueHeat_1(MO())
-  // expected-error@-1{{noncopyable type 'MO' cannot be substituted for copyable generic parameter 'each T' in 'packingUniqueHeat_1'}}
-
-  packingUniqueHeat_2(MO())
-  // expected-error@-1{{noncopyable type 'MO' cannot be substituted for copyable generic parameter 'each T' in 'packingUniqueHeat_2'}}
-
-  packingUniqueHeat_1(10)
-}

test/Generics/inverse_copyable_requirement.swift

@@ -0,0 +1,34 @@
+// RUN: %target-typecheck-verify-swift
+
+// a concrete move-only type
+struct MO: ~Copyable {
+  var x: Int?
+}
+
+func totallyInvalid<T>(_ t: T) where MO: ~Copyable {}
+// expected-error@-1{{cannot suppress conformances here}}
+
+func packingHeat<each T>(_ t: repeat each T) {} // expected-note {{generic parameter 'each T' has an implicit Copyable requirement}}
+func packIt() {
+  packingHeat(MO())  // expected-error {{noncopyable type 'MO' cannot be substituted for copyable generic parameter 'each T' in 'packingHeat'}}
+  packingHeat(10)
+}
+
+func packingUniqueHeat_1<each T: ~Copyable>(_ t: repeat each T) {}
+// expected-error@-1{{cannot suppress conformances here}}
+// expected-note@-2{{generic parameter 'each T' has an implicit Copyable requirement}}
+
+func packingUniqueHeat_2<each T>(_ t: repeat each T)
+   where repeat each T: ~Copyable {}
+// expected-error@-1{{cannot suppress conformances here}}
+// expected-note@-3{{generic parameter 'each T' has an implicit Copyable requirement}}
+
+func packItUniquely() {
+  packingUniqueHeat_1(MO())
+  // expected-error@-1{{noncopyable type 'MO' cannot be substituted for copyable generic parameter 'each T' in 'packingUniqueHeat_1'}}
+
+  packingUniqueHeat_2(MO())
+  // expected-error@-1{{noncopyable type 'MO' cannot be substituted for copyable generic parameter 'each T' in 'packingUniqueHeat_2'}}
+
+  packingUniqueHeat_1(10)
+}