---

yaml
---
r: 343487
b: refs/heads/master-rebranch
c: 5077b00
h: refs/heads/master
i:
  343485: f8fb386
  343483: fa2bb09
  343479: cf684a0
  343471: 31a4cc7
  343455: b41ef6c
  343423: 743a2cd

Author: theblixguy

[refs]

@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 5d04df013a0ab138403d12d3d14ae59a3777e84a
+refs/heads/master-rebranch: 5077b0036c01ae28b1bdf54e8587cc3d52b465b1
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/test/decl/protocol/req/witness_fix_its.swift

@@ -16,15 +16,15 @@ protocol Foo {
 
 struct ConformsToFoo: Foo { // expected-error {{type 'ConformsToFoo' does not conform to protocol 'Foo'}}
   let bar1: Int // expected-note {{candidate is not settable, but protocol requires it}}{{3-6=var}}
-  var bar2: Int // expected-note {{candidate operates on an instance, not a type as required}}{{3-3=static}}
+  var bar2: Int // expected-note {{candidate operates on an instance, not a type as required}}{{3-3=static }}
   static var bar3: Int = 1 // expected-note {{candidate operates on a type, not an instance as required}}{{3-10=}}
   static postfix func ^^^(value: ConformsToFoo) -> Int { return 0 } // expected-error {{operator implementation without matching operator declaration}}
   // expected-note@-1 {{candidate is postfix, not prefix as required}}{{10-17=prefix}}
   static prefix func ^^^^(value: ConformsToFoo) -> Int { return 0 } // expected-error {{operator implementation without matching operator declaration}}
   // expected-note@-1 {{candidate is prefix, not postfix as required}}{{10-16=postfix}}
   func bar4(closure: () throws -> Int) throws {} // expected-note {{candidate is not 'rethrows', but protocol requires it}}{{40-46=rethrows}}
   var bar5: Int { return 0 } // expected-note {{candidate is not settable, but protocol requires it}}{{none}}
-  subscript(_ pos: Int) -> Int { return 0 } // expected-note {{candidate operates on an instance, not a type as required}}{{3-3=static}}
+  subscript(_ pos: Int) -> Int { return 0 } // expected-note {{candidate operates on an instance, not a type as required}}{{3-3=static }}
 }
 
 protocol Foo1 {