Merge pull request #2043 from practicalswift/syntax-01

[gardening] "if (foo)[SPACE][SPACE]{" → "if (foo)[SPACE]{"

Author: practicalswift

docs/proposals/InitializerInheritance.rst

@@ -203,7 +203,7 @@ examples::
   class B3 : A {
     var counter: Int 
 
-    init withInitialCount(initialCount: Int)  { // subobject initializer
+    init withInitialCount(initialCount: Int) { // subobject initializer
       counter = initialCount
       super.init(withTitle: "Unnamed")
     }

lib/AST/Type.cpp

@@ -650,7 +650,7 @@ CanType CanType::getAnyOptionalObjectTypeImpl(CanType type,
   return CanType();
 }
 
-Type TypeBase::getAnyPointerElementType(PointerTypeKind &PTK)  {
+Type TypeBase::getAnyPointerElementType(PointerTypeKind &PTK) {
   if (auto boundTy = getAs<BoundGenericType>()) {
     auto &C = getASTContext();
     if (boundTy->getDecl() == C.getUnsafeMutablePointerDecl()) {

lib/ClangImporter/SwiftLookupTable.cpp

@@ -522,7 +522,7 @@ void SwiftLookupTable::deserializeAll() {
 
 /// Print a stored context to the given output stream for debugging purposes.
 static void printStoredContext(SwiftLookupTable::StoredContext context,
-                               llvm::raw_ostream &out)  {
+                               llvm::raw_ostream &out) {
   switch (context.first) {
   case SwiftLookupTable::ContextKind::TranslationUnit:
     out << "TU";

lib/IRGen/GenExistential.cpp

@@ -157,7 +157,7 @@ class ExistentialTypeInfoBase : public Base,
   ExistentialTypeInfoBase(ArrayRef<ProtocolEntry> protocols,
                           As &&...args)
       : Base(std::forward<As>(args)...),
-        NumStoredProtocols(protocols.size())  {
+        NumStoredProtocols(protocols.size()) {
     std::uninitialized_copy(protocols.begin(), protocols.end(),
                             this->template getTrailingObjects<ProtocolEntry>());
   }

lib/Parse/ParseDecl.cpp

@@ -5214,7 +5214,7 @@ ParserStatus Parser::parseDeclSubscript(ParseDeclOptions Flags,
   // '{'
   // Parse getter and setter.
   ParsedAccessors accessors;
-  if (Tok.isNot(tok::l_brace))  {
+  if (Tok.isNot(tok::l_brace)) {
     // Subscript declarations must always have at least a getter, so they need
     // to be followed by a {.
     if (Flags.contains(PD_InProtocol))

lib/Parse/ParseSIL.cpp

@@ -3224,7 +3224,7 @@ bool SILParser::parseSILInstruction(SILBasicBlock *BB) {
         if (intTy) {
           // If it is a switch on an integer type, check that all case values
           // are integer literals or undef.
-          if (!isa<SILUndef>(CaseVal))  {
+          if (!isa<SILUndef>(CaseVal)) {
             auto *IL = dyn_cast<IntegerLiteralInst>(CaseVal);
             if (!IL) {
               P.diagnose(P.Tok, diag::sil_integer_literal_not_integer_type);

lib/SILOptimizer/Transforms/DeadStoreElimination.cpp

@@ -476,7 +476,7 @@ class DSEContext {
 
 } // end anonymous namespace
 
-void BlockState::init(DSEContext &Ctx, bool Optimistic)  {
+void BlockState::init(DSEContext &Ctx, bool Optimistic) {
   std::vector<LSLocation> &LV = Ctx.getLocationVault();
   LocationNum = LV.size();
   // For function that requires just 1 iteration of the data flow to converge

lib/SILOptimizer/Transforms/Sink.cpp

@@ -73,7 +73,7 @@ class CodeSinkingPass : public SILFunctionTransform {
 
     // TODO: We may want to delete debug instructions to allow us to sink more
     // instructions.
-    for (auto *Operand : II->getUses())  {
+    for (auto *Operand : II->getUses()) {
       SILInstruction *User = Operand->getUser();
 
       // Check if the instruction is already in the user's block.

lib/Sema/CSGen.cpp

@@ -189,7 +189,7 @@ namespace {
         LTI.haveStringLiteral = true;
         auto tyvar = expr->getType()->getAs<TypeVariableType>();
 
-        if (tyvar)  {
+        if (tyvar) {
           LTI.stringLiteralTyvars.push_back(tyvar);
         }
 

test/ClangModules/objc_init.swift

@@ -98,13 +98,13 @@ class MyTableViewController : NSTableViewController {
 }
 
 class MyOtherTableViewController : NSTableViewController {
-  override init(int i: Int)  {
+  override init(int i: Int) {
     super.init(int: i)
   }
 } // expected-error{{'required' initializer 'init(coder:)' must be provided by subclass of 'NSTableViewController'}}
 
 class MyThirdTableViewController : NSTableViewController {
-  override init(int i: Int)  {
+  override init(int i: Int) {
     super.init(int: i)
   }
 

test/Interpreter/mandelbrot.swift

@@ -33,7 +33,7 @@ func getMandelbrotIterations(c: Complex, _ maxIterations: Int) -> Int {
 
 func mandelbrot(xMin: Double, _ xMax: Double,
                 _ yMin: Double, _ yMax: Double,
-                _ rows: Int, _ cols: Int)  {
+                _ rows: Int, _ cols: Int) {
   // Set the spacing for the points in the Mandelbrot set.
   var dX = (xMax - xMin) / Double(rows)
   var dY = (yMax - yMin) / Double(cols)

test/SILOptimizer/spec_recursion.swift

@@ -13,7 +13,7 @@ x1.new_method(<, left: 0, right: 1)
 
 struct Test<T> {
   init() {}
-  func recursive(x x : T)  {
+  func recursive(x x : T) {
     return recursive(x: x)
   }
 }

test/attr/attr_objc.swift

@@ -1689,7 +1689,7 @@ extension PlainClass {
 
   // CHECK-LABEL: @objc(setWithRed:green:blue:alpha:) dynamic func set
   @objc(setWithRed:green:blue:alpha:)
-  func set(_: Float, green: Float, blue: Float, alpha: Float)  { }
+  func set(_: Float, green: Float, blue: Float, alpha: Float) { }
 
   // CHECK-LABEL: @objc(createWithRed:green:blue:alpha:) dynamic class func createWith
   @objc(createWithRed:green blue:alpha)

test/decl/ext/protocol_as_witness.swift

@@ -24,7 +24,7 @@ struct X2 : P2 {
 }
 
 extension P2 where Self : Comparable {
-  func f()  {}
+  func f() {}
 }
 
 // rdar://problem/19423637