Resolve conflicts with master

Author: PatrickPijnappel

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-<!-- Please complete this template before creating pull request. -->
+<!-- Please complete this template before creating the pull request. -->
 #### What's in this pull request?
 <!-- Description about pull request. -->
 
@@ -21,17 +21,27 @@ The swift-ci is triggered by writing a comment on this PR addressed to the GitHu
         Platform     | Comment
         ------------ | -------------
         All supported platforms     | @swift-ci Please smoke test
+        All supported platforms     | @swift-ci Please smoke test and merge
         OS X platform               | @swift-ci Please smoke test OS X platform
         Linux platform              | @swift-ci Please smoke test Linux platform
 
- **Validation Testing**
+**Validation Testing**
 
         Platform     | Comment
         ------------ | -------------
         All supported platforms     | @swift-ci Please test
+        All supported platforms     | @swift-ci Please test and merge
         OS X platform               | @swift-ci Please test OS X platform
+        OS X platform               | @swift-ci Please benchmark
         Linux platform              | @swift-ci Please test Linux platform
 
+
+**Lint Testing**
+
+        Language     | Comment
+        ------------ | -------------
+        Python       | @swift-ci Please Python lint
+
 Note: Only members of the Apple organization can trigger swift-ci.
 </details>
 <!-- Thank you for your contribution to Swift! -->

.gitignore

@@ -13,7 +13,7 @@
 *~
 # Merge files created by git.
 *.orig
-# Byte compiled python modules.
+# Byte compiled Python modules.
 *.pyc
 # vim swap files
 .*.sw[a-z]

.pep8

@@ -1,2 +1,2 @@
 [flake8]
-filename = *.py,80+-check,Benchmark_Driver,Benchmark_DTrace.in,Benchmark_GuardMalloc.in,Benchmark_RuntimeLeaksRunner.in,build-script,check-incremental,gyb,line-directive,mock-distcc,ns-html2rst,recursive-lipo,rth,split-generated-tests,submit-benchmark-results,update-checkout,viewcfg,backtrace-check
+filename = *.py,80+-check,Benchmark_Driver,Benchmark_DTrace.in,Benchmark_GuardMalloc.in,Benchmark_RuntimeLeaksRunner.in,build-script,check-incremental,gyb,line-directive,mock-distcc,ns-html2rst,recursive-lipo,rth,run-test,submit-benchmark-results,update-checkout,viewcfg,backtrace-check

CHANGELOG.md

@@ -3,6 +3,91 @@ Note: This is in reverse chronological order, so newer entries are added to the
 Swift 3.0
 ---------
 
+* [SE-0060](https://github.com/apple/swift-evolution/blob/master/proposals/0060-defaulted-parameter-order.md):
+  Function parameters with default arguments must now be specified in
+  declaration order. A call site must always supply the arguments it provides
+  to a function in their declared order:
+
+    ```swift
+    func requiredArguments(a: Int, b: Int, c: Int) {}
+    func defaultArguments(a: Int = 0, b: Int = 0, c: Int = 0) {}
+
+    requiredArguments(a: 0, b: 1, c: 2)
+    requiredArguments(b: 0, a: 1, c: 2) // error
+    defaultArguments(a: 0, b: 1, c: 2)
+    defaultArguments(b: 0, a: 1, c: 2) // error
+    ```
+
+    Arbitrary labeled parameters with default arguments may still be elided, as
+    long as the specified arguments follow declaration order:
+
+    ```swift
+    defaultArguments(a: 0) // ok
+    defaultArguments(b: 1) // ok
+    defaultArguments(c: 2) // ok
+    defaultArguments(a: 1, c: 2) // ok
+    defaultArguments(b: 1, c: 2) // ok
+    defaultArguments(c: 1, b: 2) // error
+    ```
+
+* Traps from force-unwrapping nil `Optional`s now show the source location
+  of the force unwrap operator.
+
+* [SE-0093](https://github.com/apple/swift-evolution/blob/master/proposals/0093-slice-base.md): Slice types now have a `base` property that allows public readonly access to their base collections.
+
+* Nested generic functions may now capture bindings from the environment, for example:
+
+    ```swift
+    func outer<T>(t: T) -> T {
+      func inner<U>(u: U) -> (T, U) {
+        return (t, u)
+      }
+      return inner(u: (t, t)).0
+    }
+    ```
+
+* Initializers are now inherited even if the base class or derived class is generic:
+
+    ```swift
+    class Base<T> {
+      let t: T
+
+      init(t: T) {
+        self.t = t
+      }
+    }
+
+    class Derived<T> : Base<T> {
+      // init(t: T) is now synthesized to call super.init(t: t)
+    }
+    ```
+
+* [SE-0081](https://github.com/apple/swift-evolution/blob/master/proposals/0081-move-where-expression.md)
+  "Move 'where' clause to end of declaration" is implemented, allowing you to 
+  write 'where' clauses after the signature for a declaration, but before its
+  body.  For example, before:
+
+    ```swift
+    func anyCommonElements<T : SequenceType, U : SequenceType 
+                           where T.Generator.Element: Equatable, T.Generator.Element == U.Generator.Element>
+        (lhs: T, _ rhs: U) -> Bool
+    {
+        ...
+    }
+    ```
+
+  after:
+
+    ```swift
+    func anyCommonElements<T : SequenceType, U : SequenceType>(lhs: T, _ rhs: U) -> Bool
+        where T.Generator.Element: Equatable, T.Generator.Element == U.Generator.Element
+    {
+        ...
+    }
+    ```
+   
+  The old form is still accepted for compatibility, but will eventually be rejected.
+
 * [SE-0071](https://github.com/apple/swift-evolution/blob/master/proposals/0071-member-keywords.md):
   "Allow (most) keywords in member references" is implemented.  This allows the
   use of members after a dot without backticks, e.g. "foo.default".
@@ -184,7 +269,7 @@ Swift 3.0
 * Generic signatures can now contain superclass requirements with generic
   parameter types, for example:
 
-  ```
+  ```swift
   func f<Food : Chunks<Meat>, Meat : Molerat>(f: Food, m: Meat) {}
   ```
 
@@ -225,6 +310,9 @@ Swift 3.0
     person.valueForKeyPath(#keyPath(Person.bestFriend.lastName))
     ```
 
+**If you are adding a new entry, add it to the top of the file, not here!**
+
+
 Swift 2.2
 ---------