Format after all the renames

Mostly just to fix up the `<optional>` include location.

Author: bnbarham

include/swift/AST/ASTDemangler.h

@@ -27,8 +27,8 @@
 #include "swift/Demangling/NamespaceMacros.h"
 #include "swift/Demangling/TypeDecoder.h"
 #include "llvm/ADT/ArrayRef.h"
-#include <optional>
 #include "llvm/ADT/StringRef.h"
+#include <optional>
 
 namespace swift {
 

include/swift/AST/ASTPrinter.h

@@ -306,8 +306,7 @@ class ASTPrinter {
   void callPrintDeclPre(const Decl *D, std::optional<BracketOptions> Bracket);
 
   /// Make a callback to printDeclPost(), performing any necessary bookkeeping.
-  void callPrintDeclPost(const Decl *D,
-                         std::optional<BracketOptions> Bracket) {
+  void callPrintDeclPost(const Decl *D, std::optional<BracketOptions> Bracket) {
     printDeclPost(D, Bracket);
   }
 

include/swift/AST/ASTScope.h

@@ -37,10 +37,10 @@
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/NullablePtr.h"
 #include "swift/Basic/SourceManager.h"
-#include <optional>
 #include "llvm/ADT/PointerIntPair.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
+#include <optional>
 
 /// In case there's a bug in the ASTScope lookup system, suggest that the user
 /// try disabling it.

include/swift/AST/ASTWalker.h

@@ -14,9 +14,9 @@
 #define SWIFT_AST_ASTWALKER_H
 
 #include "swift/Basic/LLVM.h"
-#include <optional>
 #include "llvm/ADT/None.h"
 #include "llvm/ADT/PointerUnion.h"
+#include <optional>
 #include <utility>
 
 namespace swift {

include/swift/AST/AbstractSourceFileDepGraphFactory.h

@@ -16,8 +16,8 @@
 #include "swift/AST/Decl.h"
 #include "swift/AST/DeclContext.h"
 #include "swift/AST/FineGrainedDependencies.h"
-#include <optional>
 #include "llvm/Support/VirtualOutputBackend.h"
+#include <optional>
 
 namespace swift {
 class DiagnosticEngine;

include/swift/AST/AccessNotes.h

@@ -21,10 +21,10 @@
 #include "swift/AST/Identifier.h"
 #include "swift/AST/StorageImpl.h"
 #include "swift/Basic/NullablePtr.h"
-#include <optional>
 #include "llvm/Support/Error.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/raw_ostream.h"
+#include <optional>
 #include <set>
 #include <string>
 #include <vector>
@@ -97,8 +97,8 @@ class AccessNotesFile {
 
   /// Load the access notes from \p buffer, or \c None if they cannot be loaded.
   /// Diagnoses any parsing issues with the access notes file.
-  static std::optional<AccessNotesFile>
-      load(ASTContext &ctx, const llvm::MemoryBuffer *buffer);
+  static std::optional<AccessNotesFile> load(ASTContext &ctx,
+                                             const llvm::MemoryBuffer *buffer);
 
   /// Look up the access note in this file, if any, which applies to \p VD.
   NullablePtr<const AccessNote> lookup(ValueDecl *VD) const;

include/swift/AST/AccessScope.h

@@ -17,8 +17,8 @@
 #include "swift/AST/DeclContext.h"
 #include "swift/Basic/Debug.h"
 #include "llvm/ADT/None.h"
-#include <optional>
 #include "llvm/ADT/PointerIntPair.h"
+#include <optional>
 
 namespace swift {
 

include/swift/AST/AnyFunctionRef.h

@@ -22,8 +22,8 @@
 #include "swift/Basic/LLVM.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/None.h"
-#include <optional>
 #include "llvm/ADT/PointerUnion.h"
+#include <optional>
 
 namespace swift {
 class CaptureInfo;

include/swift/AST/ArgumentList.h

@@ -20,9 +20,9 @@
 #include "swift/AST/ASTAllocated.h"
 #include "swift/AST/Types.h"
 #include "swift/Basic/Debug.h"
-#include <optional>
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/TrailingObjects.h"
+#include <optional>
 
 namespace swift {
 /// Forward declared trampoline for Expr::getType.
@@ -221,9 +221,8 @@ class alignas(Argument) ArgumentList final
   /// \param arena The arena to allocate the ArgumentList in.
   static ArgumentList *
   create(ASTContext &ctx, SourceLoc lParenLoc, ArrayRef<Argument> args,
-         SourceLoc rParenLoc,
-         std::optional<unsigned> firstTrailingClosureIndex, bool isImplicit,
-         ArgumentList *originalArgs = nullptr,
+         SourceLoc rParenLoc, std::optional<unsigned> firstTrailingClosureIndex,
+         bool isImplicit, ArgumentList *originalArgs = nullptr,
          AllocationArena arena = AllocationArena::Permanent);
 
   /// Create a new explicit parsed ArgumentList.
@@ -528,7 +527,7 @@ class alignas(Argument) ArgumentList final
   /// will match against semantic sub-expressions, but that may be disabled by
   /// passing \c false for \c allowSemantic.
   std::optional<unsigned> findArgumentExpr(Expr *expr,
-                                            bool allowSemantic = true) const;
+                                           bool allowSemantic = true) const;
 
   /// Creates a TupleExpr or ParenExpr that holds the argument exprs. A
   /// ParenExpr will be returned for a single argument, otherwise a TupleExpr.

include/swift/AST/Attr.h

@@ -39,14 +39,14 @@
 #include "swift/Basic/SourceLoc.h"
 #include "swift/Basic/UUID.h"
 #include "swift/Basic/Version.h"
-#include <optional>
 #include "llvm/ADT/DenseMapInfo.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/iterator_range.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/TrailingObjects.h"
 #include "llvm/Support/VersionTuple.h"
+#include <optional>
 
 namespace swift {
 class ArgumentList;
@@ -664,8 +664,7 @@ enum class PlatformAgnosticAvailabilityKind {
 /// Defines the @available attribute.
 class AvailableAttr : public DeclAttribute {
 public:
-#define INIT_VER_TUPLE(X)                                                      \
-  X(X.empty() ? std::optional<llvm::VersionTuple>() : X)
+#define INIT_VER_TUPLE(X) X(X.empty() ? std::optional<llvm::VersionTuple>() : X)
 
   AvailableAttr(SourceLoc AtLoc, SourceRange Range, PlatformKind Platform,
                 StringRef Message, StringRef Rename, ValueDecl *RenameDecl,
@@ -2348,18 +2347,17 @@ class ExternAttr : public DeclAttribute {
   SourceLoc LParenLoc, RParenLoc;
 
 public:
-  ExternAttr(std::optional<StringRef> ModuleName,
-             std::optional<StringRef> Name, SourceLoc AtLoc,
-             SourceLoc LParenLoc, SourceLoc RParenLoc, SourceRange Range,
-             ExternKind Kind, bool Implicit)
+  ExternAttr(std::optional<StringRef> ModuleName, std::optional<StringRef> Name,
+             SourceLoc AtLoc, SourceLoc LParenLoc, SourceLoc RParenLoc,
+             SourceRange Range, ExternKind Kind, bool Implicit)
       : DeclAttribute(DeclAttrKind::Extern, AtLoc, Range, Implicit),
         LParenLoc(LParenLoc), RParenLoc(RParenLoc), ModuleName(ModuleName),
         Name(Name) {
     Bits.ExternAttr.kind = static_cast<unsigned>(Kind);
   }
 
-  ExternAttr(std::optional<StringRef> ModuleName,
-             std::optional<StringRef> Name, ExternKind Kind, bool Implicit)
+  ExternAttr(std::optional<StringRef> ModuleName, std::optional<StringRef> Name,
+             ExternKind Kind, bool Implicit)
       : ExternAttr(ModuleName, Name, SourceLoc(), SourceLoc(), SourceLoc(),
                    SourceRange(), Kind, Implicit) {}
 
@@ -2558,22 +2556,23 @@ class RawLayoutAttr final : public DeclAttribute {
   /// Return the type whose array layout the attribute type should get its
   /// layout from, along with the size of that array. Returns None if the
   /// attribute specifies scalar or manual layout.
-  std::optional<std::pair<TypeRepr *, unsigned>> getArrayLikeTypeAndCount() const {
+  std::optional<std::pair<TypeRepr *, unsigned>>
+  getArrayLikeTypeAndCount() const {
     if (!LikeType)
       return std::nullopt;
     if (Alignment == ~0u)
       return std::nullopt;
     return std::make_pair(LikeType, SizeOrCount);
   }
-  
+
   /// Return the size and alignment of the attributed type. Returns
   /// None if the attribute specifies layout like some other type.
   std::optional<std::pair<unsigned, unsigned>> getSizeAndAlignment() const {
     if (LikeType)
       return std::nullopt;
     return std::make_pair(SizeOrCount, Alignment);
   }
-  
+
   Type getResolvedLikeType(StructDecl *sd) const;
 
   /// Return the type whose single-element layout the attribute type should get
@@ -2586,7 +2585,7 @@ class RawLayoutAttr final : public DeclAttribute {
       return std::nullopt;
     return getResolvedLikeType(sd);
   }
-  
+
   /// Return the type whose array layout the attribute type should get its
   /// layout from, along with the size of that array. Returns None if the
   /// attribute specifies scalar or manual layout.
@@ -2598,7 +2597,7 @@ class RawLayoutAttr final : public DeclAttribute {
       return std::nullopt;
     return std::make_pair(getResolvedLikeType(sd), SizeOrCount);
   }
-  
+
   static bool classof(const DeclAttribute *DA) {
     return DA->getKind() == DeclAttrKind::RawLayout;
   }

include/swift/AST/Availability.h

@@ -19,8 +19,8 @@
 
 #include "swift/AST/Type.h"
 #include "swift/Basic/LLVM.h"
-#include <optional>
 #include "llvm/Support/VersionTuple.h"
+#include <optional>
 
 namespace swift {
 class ASTContext;
@@ -230,11 +230,12 @@ class UnavailabilityReason {
 class AvailabilityContext {
   VersionRange OSVersion;
   std::optional<bool> SPI;
+
 public:
   /// Creates a context that requires certain versions of the target OS.
   explicit AvailabilityContext(VersionRange OSVersion,
                                std::optional<bool> SPI = std::nullopt)
-    : OSVersion(OSVersion), SPI(SPI) {}
+      : OSVersion(OSVersion), SPI(SPI) {}
 
   /// Creates a context that imposes the constraints of the ASTContext's
   /// deployment target.

include/swift/AST/CatchNode.h

@@ -13,12 +13,12 @@
 #ifndef SWIFT_AST_CATCHNODE_H
 #define SWIFT_AST_CATCHNODE_H
 
-#include "llvm/ADT/Hashing.h"
-#include <optional>
-#include "llvm/ADT/PointerUnion.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/Expr.h"
 #include "swift/AST/Stmt.h"
+#include "llvm/ADT/Hashing.h"
+#include "llvm/ADT/PointerUnion.h"
+#include <optional>
 
 namespace swift {
 

include/swift/AST/ConstTypeInfo.h

@@ -234,17 +234,15 @@ struct ConstValueTypePropertyInfo {
   std::shared_ptr<CompileTimeValue> Value;
   std::optional<AttrValueVector> PropertyWrappers;
 
-  ConstValueTypePropertyInfo(
-      swift::VarDecl *VarDecl, std::shared_ptr<CompileTimeValue> Value,
-      std::optional<AttrValueVector> PropertyWrappers)
-      : VarDecl(VarDecl), Value(Value), PropertyWrappers(PropertyWrappers)
-    {}
+  ConstValueTypePropertyInfo(swift::VarDecl *VarDecl,
+                             std::shared_ptr<CompileTimeValue> Value,
+                             std::optional<AttrValueVector> PropertyWrappers)
+      : VarDecl(VarDecl), Value(Value), PropertyWrappers(PropertyWrappers) {}
 
   ConstValueTypePropertyInfo(swift::VarDecl *VarDecl,
                              std::shared_ptr<CompileTimeValue> Value)
       : VarDecl(VarDecl), Value(Value),
-        PropertyWrappers(std::optional<AttrValueVector>())
-    {}
+        PropertyWrappers(std::optional<AttrValueVector>()) {}
 };
 
 struct ConstValueTypeInfo {

include/swift/AST/Decl.h

@@ -6316,8 +6316,7 @@ class VarDecl : public AbstractStorageDecl {
 
   /// Retrieve information about the mutability of the composed
   /// property wrappers.
-  std::optional<PropertyWrapperMutability>
-  getPropertyWrapperMutability() const;
+  std::optional<PropertyWrapperMutability> getPropertyWrapperMutability() const;
 
   /// Returns whether this property is the backing storage property or a storage
   /// wrapper for wrapper instance's projectedValue. If this property is

include/swift/AST/DeclContext.h

@@ -29,11 +29,11 @@
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/STLExtras.h"
 #include "swift/Basic/SourceLoc.h"
-#include <optional>
 #include "llvm/ADT/PointerEmbeddedInt.h"
 #include "llvm/ADT/PointerIntPair.h"
 #include "llvm/ADT/PointerUnion.h"
 #include "llvm/Support/raw_ostream.h"
+#include <optional>
 
 #include <type_traits>
 

include/swift/AST/DiagnosticConsumer.h

@@ -22,8 +22,8 @@
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/SourceLoc.h"
 #include "llvm/ADT/None.h"
-#include <optional>
 #include "llvm/Support/SourceMgr.h"
+#include <optional>
 
 namespace swift {
   class DiagnosticArgument;

include/swift/AST/DiagnosticEngine.h

@@ -577,8 +577,8 @@ namespace swift {
 
     /// Conditionally limit the diagnostic behavior if the given \c limit
     /// is not \c None.
-    InFlightDiagnostic &limitBehaviorIf(
-        std::optional<DiagnosticBehavior> limit) {
+    InFlightDiagnostic &
+    limitBehaviorIf(std::optional<DiagnosticBehavior> limit) {
       if (!limit) {
         return *this;
       }

include/swift/AST/Expr.h

@@ -33,8 +33,8 @@
 #include "swift/Basic/Debug.h"
 #include "swift/Basic/InlineBitfield.h"
 #include "llvm/ADT/None.h"
-#include <optional>
 #include "llvm/Support/TrailingObjects.h"
+#include <optional>
 #include <utility>
 
 namespace llvm {

include/swift/AST/ExtInfo.h

@@ -24,8 +24,8 @@
 #include "swift/AST/LifetimeDependence.h"
 
 #include "llvm/ADT/None.h"
-#include <optional>
 #include "llvm/Support/raw_ostream.h"
+#include <optional>
 
 #include <utility>
 

include/swift/AST/FineGrainedDependencies.h

@@ -22,14 +22,14 @@
 #include "swift/Basic/ReferenceDependencyKeys.h"
 #include "llvm/ADT/Hashing.h"
 #include "llvm/ADT/None.h"
-#include <optional>
 #include "llvm/ADT/SetVector.h"
 #include "llvm/Support/MD5.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/VirtualOutputBackend.h"
 #include "llvm/Support/YAMLParser.h"
 #include "llvm/Support/YAMLTraits.h"
 #include "llvm/Support/raw_ostream.h"
+#include <optional>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
@@ -892,8 +892,7 @@ class SourceFileDepGraph {
 
   /// Read a swiftdeps file from \p buffer and return a SourceFileDepGraph if
   /// successful.
-  std::optional<SourceFileDepGraph> static loadFromBuffer(
-      llvm::MemoryBuffer &);
+  std::optional<SourceFileDepGraph> static loadFromBuffer(llvm::MemoryBuffer &);
   std::optional<SourceFileDepGraph> static loadFromSwiftModuleBuffer(
       llvm::MemoryBuffer &);