s/must have (internal|public) access/must be declared $1/ in diagnostic.

Thanks, Chris!

Swift SVN r19759

Author: jrose-apple

include/swift/AST/DiagnosticsSema.def

@@ -524,9 +524,9 @@ ERROR(witness_argument_name_mismatch,sema_tcd,none,
       "required by protocol %2 (%3)", (bool, DeclName, Type, DeclName))
 ERROR(witness_not_accessible_proto,sema_tcd,none,
       "%select{initializer %1|method %1|%select{|setter for }2property %1"
-      "|subscript%select{| setter}2}0 must have "
-      "%select{PRIVATE|internal|public}3 access because it matches a "
-      "requirement in %select{PRIVATE|internal|public}3 protocol %4",
+      "|subscript%select{| setter}2}0 must be declared "
+      "%select{PRIVATE|internal|public}3 because it matches a requirement "
+      "in %select{PRIVATE|internal|public}3 protocol %4",
       (RequirementKind, DeclName, bool, Accessibility, DeclName))
 ERROR(witness_not_accessible_type,sema_tcd,none,
       "%select{initializer %1|method %1|%select{|setter for }2property %1"

test/Sema/accessibility.swift

@@ -15,15 +15,15 @@ private protocol PrivateProto {
 }
 
 public struct PublicStruct: PublicProto, InternalProto, PrivateProto {
-  private func publicReq() {} // expected-error {{method 'publicReq()' must have public access because it matches a requirement in public protocol 'PublicProto'}} {{3-10=public}}
-  private func internalReq() {} // expected-error {{method 'internalReq()' must have internal access because it matches a requirement in internal protocol 'InternalProto'}} {{3-10=internal}}
+  private func publicReq() {} // expected-error {{method 'publicReq()' must be declared public because it matches a requirement in public protocol 'PublicProto'}} {{3-10=public}}
+  private func internalReq() {} // expected-error {{method 'internalReq()' must be declared internal because it matches a requirement in internal protocol 'InternalProto'}} {{3-10=internal}}
   private func privateReq() {}
 }
 
 // expected-note@+1 + {{type declared here}}
 internal struct InternalStruct: PublicProto, InternalProto, PrivateProto {
   private func publicReq() {} // expected-error {{method 'publicReq()' must be as accessible as its enclosing type because it matches a requirement in protocol 'PublicProto'}} {{3-10=internal}}
-  private func internalReq() {} // expected-error {{method 'internalReq()' must have internal access because it matches a requirement in internal protocol 'InternalProto'}} {{3-10=internal}}
+  private func internalReq() {} // expected-error {{method 'internalReq()' must be declared internal because it matches a requirement in internal protocol 'InternalProto'}} {{3-10=internal}}
   private func privateReq() {}
 }
 
@@ -35,7 +35,7 @@ private struct PrivateStruct: PublicProto, InternalProto, PrivateProto {
 }
 
 public struct PublicStructDefaultMethods: PublicProto, InternalProto, PrivateProto {
-  func publicReq() {} // expected-error {{method 'publicReq()' must have public access because it matches a requirement in public protocol 'PublicProto'}} {{3-3=public }}
+  func publicReq() {} // expected-error {{method 'publicReq()' must be declared public because it matches a requirement in public protocol 'PublicProto'}} {{3-3=public }}
   func internalReq() {}
   func privateReq() {}
 }
@@ -246,17 +246,17 @@ internal protocol InternalMutationOperations {
 }
 
 public struct AccessorsControl : InternalMutationOperations {
-  private var size = 0 // expected-error {{property 'size' must have internal access because it matches a requirement in internal protocol 'InternalMutationOperations'}}
-  private subscript (Int) -> Int { // expected-error {{subscript must have internal access because it matches a requirement in internal protocol 'InternalMutationOperations'}}
+  private var size = 0 // expected-error {{property 'size' must be declared internal because it matches a requirement in internal protocol 'InternalMutationOperations'}}
+  private subscript (Int) -> Int { // expected-error {{subscript must be declared internal because it matches a requirement in internal protocol 'InternalMutationOperations'}}
     get { return 42 }
     set {}
   }
 }
 
 public struct PrivateSettersPublic : InternalMutationOperations {
   // Please don't change the formatting here; it's a precise fix-it test.
-  public private(set) var size = 0 // expected-error {{setter for property 'size' must have internal access because it matches a requirement in internal protocol 'InternalMutationOperations'}} {{10-17=internal}}
-  internal private(set) subscript (Int) -> Int { // expected-error {{subscript setter must have internal access because it matches a requirement in internal protocol 'InternalMutationOperations'}} {{12-25=}}
+  public private(set) var size = 0 // expected-error {{setter for property 'size' must be declared internal because it matches a requirement in internal protocol 'InternalMutationOperations'}} {{10-17=internal}}
+  internal private(set) subscript (Int) -> Int { // expected-error {{subscript setter must be declared internal because it matches a requirement in internal protocol 'InternalMutationOperations'}} {{12-25=}}
     get { return 42 }
     set {}
   }