Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

include/swift/Basic/TreeScopedHashTable.h

@@ -150,10 +150,8 @@ class TreeScopedHashTableDetachedScope {
   const ImplTy *getImpl() { return DetachedImpl; }
 
 public:
-  TreeScopedHashTableDetachedScope &operator=(
-                            const TreeScopedHashTableDetachedScope &) = default;
-  TreeScopedHashTableDetachedScope &operator=(
-                                 TreeScopedHashTableDetachedScope &&) = default;
+  TreeScopedHashTableDetachedScope &
+  operator=(TreeScopedHashTableDetachedScope &&) = default;
 
   TreeScopedHashTableDetachedScope() : DetachedImpl(0) {}