Merge branch 'master' into comparable-enums

Author: tayloraswift

.flake8

@@ -1,32 +1,74 @@
 [flake8]
-ignore = W291 W504
-filename = *.py,
-           ./utils/80+-check,
-           ./utils/backtrace-check,
-           ./benchmark/scripts/Benchmark_Driver,
-           ./benchmark/scripts/Benchmark_DTrace.in,
-           ./benchmark/scripts/Benchmark_GuardMalloc.in,
-           ./benchmark/scripts/Benchmark_RuntimeLeaksRunner.in,
-           ./utils/build-script,
-           ./utils/check-incremental,
-           ./test/Driver/Inputs/fake-toolchain/clang++,
-           ./utils/coverage/coverage-build-db,
-           ./utils/coverage/coverage-generate-data,
-           ./utils/coverage/coverage-query-db,
-           ./utils/coverage/coverage-touch-tests,
-           ./utils/gyb,
-           ./test/Driver/Inputs/fake-toolchain/ld,
-           ./utils/line-directive,
-           ./utils/swift_build_support/tests/mock-distcc,
-           ./docs/scripts/ns-html2rst,
-           ./utils/PathSanitizingFileCheck,
-           ./utils/recursive-lipo,
-           ./utils/round-trip-syntax-test,
-           ./utils/rth,
-           ./utils/run-remote,
-           ./utils/run-test,
-           ./utils/scale-test,
-           ./utils/submit-benchmark-results,
-           ./utils/update-checkout,
-           ./utils/viewcfg,
-           ./utils/symbolicate-linux-fatal,
+
+filename =
+    *.py,
+
+    ./benchmark/scripts/Benchmark_Driver,
+    ./benchmark/scripts/Benchmark_DTrace.in,
+    ./benchmark/scripts/Benchmark_GuardMalloc.in,
+    ./benchmark/scripts/Benchmark_RuntimeLeaksRunner.in,
+
+    ./docs/scripts/ns-html2rst,
+
+    ./test/Driver/Inputs/fake-toolchain/clang++,
+    ./test/Driver/Inputs/fake-toolchain/ld,
+
+    ./utils/80+-check,
+    ./utils/backtrace-check,
+    ./utils/build-script,
+    ./utils/check-incremental,
+    ./utils/coverage/coverage-build-db,
+    ./utils/coverage/coverage-generate-data,
+    ./utils/coverage/coverage-query-db,
+    ./utils/coverage/coverage-touch-tests,
+    ./utils/gyb,
+    ./utils/line-directive,
+    ./utils/PathSanitizingFileCheck,
+    ./utils/recursive-lipo,
+    ./utils/round-trip-syntax-test,
+    ./utils/rth,
+    ./utils/run-remote,
+    ./utils/run-test,
+    ./utils/scale-test,
+    ./utils/submit-benchmark-results,
+    ./utils/swift_build_support/tests/mock-distcc,
+    ./utils/symbolicate-linux-fatal,
+    ./utils/update-checkout,
+    ./utils/viewcfg,
+
+    # TODO: We should be linting the lit configs.
+    #lit.cfg,
+
+    # FIXME: We need to be linting these files.
+    #./utils/build-parser-lib,
+    #./utils/dev-scripts/blockifyasm,
+    #./utils/dev-scripts/split-cmdline,
+
+exclude =
+    .git,
+    __pycache__,
+
+ignore =
+    # The black tool treats slices consistently, the E203 warning is not PEP8
+    # compliant (https://github.com/psf/black#slices).
+    E203,
+
+    # FIXME: We should not have trailing whitespace.
+    W291,
+
+    # Line breaks before binary operators are not explicitly disallowed in
+    # PEP8, rather it should be consistent throughout the project. The black
+    # tool puts them on new lines which is to be considered a best practice
+    # in the future.
+    W503,
+
+    # Similarly ignore line break after binary operators.
+    W504,
+
+    # TODO: Ignore Bugbear lints for now, but we should enable these in the
+    # future.
+    B,
+
+# 10% larger than the standard 80 character limit. Conforms to the black
+# standard and Bugbear's B950.
+max-line-length = 88

CHANGELOG.md

@@ -23,6 +23,33 @@ CHANGELOG
 
 </details>
 
+Swift Next
+----------
+
+* [SE-0269][]:
+
+  When an escaping closure explicitly captures `self` in its capture list, the
+  use of implicit `self` is enabled within that closure. This means that the
+  following code is now valid:
+  
+  ```swift
+  func doStuff(_ stuff: @escaping () -> Void) {}
+  
+  class C {
+    var x = 0
+
+    func method() {
+      doStuff { [self] in
+        x += 1
+      }
+    }
+  }
+  ```
+  
+  This proposal also introduces new diagnostics for inserting `self` into the
+  closure's capture list in addition to the existing 'use `self.` explicitly'
+  fix-it.
+
 Swift 5.2
 ---------
 
@@ -172,7 +199,7 @@ Swift 5.2
   A method override is no longer allowed to have a generic signature with
   requirements not imposed by the base method. For example:
 
-  ```
+  ```swift
   protocol P {}
 
   class Base {
@@ -7856,6 +7883,7 @@ Swift 1.0
 [SE-0252]: <https://github.com/apple/swift-evolution/blob/master/proposals/0252-keypath-dynamic-member-lookup.md>
 [SE-0253]: <https://github.com/apple/swift-evolution/blob/master/proposals/0253-callable.md>
 [SE-0254]: <https://github.com/apple/swift-evolution/blob/master/proposals/0254-static-subscripts.md>
+[SE-0269]: <https://github.com/apple/swift-evolution/blob/master/proposals/0269-implicit-self-explicit-capture.md>
 
 [SR-106]: <https://bugs.swift.org/browse/SR-106>
 [SR-419]: <https://bugs.swift.org/browse/SR-419>