Merge branch 'master' into fix/SR-9035

Author: theblixguy

CHANGELOG.md

@@ -41,10 +41,26 @@ Swift Next
   print(s[0])
   ```
 
+**Add new entries to the top of this section, not here!**
+
 Swift 5.1
 ---------
 
-* [SE-0256][]:
+* [SE-0244][]:
+
+  Functions can now hide their concrete return type by declaring what protocols
+  it conforms to instead of specifying the exact return type:
+
+  ```
+  func makeMeACollection() -> some Collection {
+    return [1, 2, 3]
+  }
+  ```
+
+  Code that calls the function can use the interface of the protocol, but
+  does not have visibility into the underlying type.
+
+* [SE-0254][]:
 
   Subscripts can now be declared `static` or (inside classes) `class`.
 
@@ -246,6 +262,8 @@ Swift 5.1
 Swift 5.0
 ---------
 
+### 2019-03-25 (Xcode 10.2)
+
 * [SE-0235][]:
 
   The standard library now contains a `Result` type for manually propagating errors.
@@ -506,8 +524,6 @@ Swift 5.0
   }
   ```
 
-**Add new entries to the top of this section, not here!**
-
 Swift 4.2
 ---------
 
@@ -7649,7 +7665,10 @@ Swift 1.0
 [SE-0230]: <https://github.com/apple/swift-evolution/blob/master/proposals/0230-flatten-optional-try.md>
 [SE-0235]: <https://github.com/apple/swift-evolution/blob/master/proposals/0235-add-result.md>
 [SE-0242]: <https://github.com/apple/swift-evolution/blob/master/proposals/0242-default-values-memberwise.md>
+[SE-0244]: <https://github.com/apple/swift-evolution/blob/master/proposals/0244-opaque-result-types.md>
 [SE-0245]: <https://github.com/apple/swift-evolution/blob/master/proposals/0245-array-uninitialized-initializer.md>
+[SE-0252]: <https://github.com/apple/swift-evolution/blob/master/proposals/0252-keypath-dynamic-member-lookup.md>
+[SE-0254]: <https://github.com/apple/swift-evolution/blob/master/proposals/0254-static-subscripts.md>
 
 [SR-106]: <https://bugs.swift.org/browse/SR-106>
 [SR-419]: <https://bugs.swift.org/browse/SR-419>
@@ -7668,6 +7687,7 @@ Swift 1.0
 [SR-4248]: <https://bugs.swift.org/browse/SR-4248>
 [SR-5581]: <https://bugs.swift.org/browse/SR-5581>
 [SR-5719]: <https://bugs.swift.org/browse/SR-5719>
+[SR-6118]: <https://bugs.swift.org/browse/SR-6118>
 [SR-7139]: <https://bugs.swift.org/browse/SR-7139>
 [SR-7251]: <https://bugs.swift.org/browse/SR-7251>
 [SR-7601]: <https://bugs.swift.org/browse/SR-7601>

benchmark/Naming.md

@@ -89,7 +89,7 @@ relative comparison across the different axis of variation.
 
 </details><p><!-- spacer --></p></li>
 <li>
-<strong>Groups and types are <code>UpperCase</code>, methods are
+<strong>Groups, variants and types are <code>UpperCase</code>, methods are
 <code>lowerCase</code>.</strong>
 <details>