Test: misc. test updates for NoncopyableGenerics

(cherry picked from commit 48beac2)

Author: kavon

test/ASTGen/types.swift

@@ -46,8 +46,7 @@ func testRepeatEach<each T>(_ t: repeat each T) -> (repeat each T) {
   fatalError()
 }
 
-// FIXME: this error isn't correct to emit. the parsing might be ignoring the ~
-struct FileDescriptor: ~Copyable { // expected-error {{struct 'FileDescriptor' required to be 'Copyable' but is marked with '~Copyable'}}
+struct FileDescriptor: ~Copyable {
   var fd = 1
 }
 

test/Parse/init_deinit.swift

@@ -33,7 +33,7 @@ struct FooStructDeinitializerB {
   deinit // expected-error {{expected '{' for deinitializer}}
 }
 
-struct FooStructDeinitializerC {
+struct FooStructDeinitializerC { // expected-note {{consider adding '~Copyable' to struct 'FooStructDeinitializerC'}}
   deinit {} // expected-error {{deinitializer cannot be declared in struct 'FooStructDeinitializerC' that conforms to 'Copyable'}}
 }
 

test/decl/protocol/protocols.swift

@@ -1,7 +1,5 @@
 // RUN: %target-typecheck-verify-swift -enable-objc-interop
 
-// XFAIL: noncopyable_generics
-
 protocol EmptyProtocol { }
 
 protocol DefinitionsInProtocols {
@@ -104,10 +102,9 @@ struct DoesNotConform : Up {
 
 // Circular protocols
 
-protocol CircleMiddle : CircleStart { func circle_middle() } // expected-error {{protocol 'CircleMiddle' refines itself}}
-// expected-note@-1 {{protocol 'CircleMiddle' declared here}}
-protocol CircleStart : CircleEnd { func circle_start() } // expected-error {{protocol 'CircleStart' refines itself}}
-// expected-note@-1 {{protocol 'CircleStart' declared here}}
+protocol CircleMiddle : CircleStart { func circle_middle() }
+// expected-note@-1 2 {{protocol 'CircleMiddle' declared here}}
+protocol CircleStart : CircleEnd { func circle_start() } // expected-error 2 {{protocol 'CircleStart' refines itself}}
 protocol CircleEnd : CircleMiddle { func circle_end()} // expected-note 2 {{protocol 'CircleEnd' declared here}}
 
 protocol CircleEntry : CircleTrivial { }