Merge pull request #3431 from practicalswift/minor-syntax-fixes

[gardening] Minor syntax cleanups.
swiftlang · Jul 10, 2016 · 1f63d98 · 1f63d98
2 parents 5d2aa7c + 808b539
commit 1f63d98
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/benchmark/single-source/Phonebook.swift b/benchmark/single-source/Phonebook.swift
@@ -14,7 +14,7 @@
 // for performance measuring.
 import TestsUtils
 
-var words=[
+var words = [
   "James", "John", "Robert", "Michael", "William", "David", "Richard", "Joseph",
   "Charles", "Thomas", "Christopher", "Daniel", "Matthew", "Donald", "Anthony",
   "Paul", "Mark", "George", "Steven", "Kenneth", "Andrew", "Edward", "Brian",
@@ -27,7 +27,8 @@ var words=[
   "Terry", "Joe", "Sean", "Willie", "Jesse", "Ralph", "Billy", "Austin", "Bruce",
   "Christian", "Roy", "Bryan", "Eugene", "Louis", "Harry", "Wayne", "Ethan",
   "Jordan", "Russell", "Alan", "Philip", "Randy", "Juan", "Howard", "Vincent",
-  "Bobby", "Dylan", "Johnny", "Phillip", "Craig"]
+  "Bobby", "Dylan", "Johnny", "Phillip", "Craig"
+]
 
 // This is a phone book record.
 struct Record : Comparable {

diff --git a/benchmark/utils/DriverUtils.swift b/benchmark/utils/DriverUtils.swift
@@ -102,8 +102,10 @@ struct TestConfig {
   var tests = [Test]()
 
   mutating func processArguments() -> TestAction {
-    let validOptions=["--iter-scale", "--num-samples", "--num-iters",
-      "--verbose", "--delim", "--run-all", "--list", "--sleep"]
+    let validOptions = [
+      "--iter-scale", "--num-samples", "--num-iters",
+      "--verbose", "--delim", "--run-all", "--list", "--sleep"
+    ]
     let maybeBenchArgs: Arguments? = parseArgs(validOptions)
     if maybeBenchArgs == nil {
       return .Fail("Failed to parse arguments")

diff --git a/lib/Sema/MiscDiagnostics.cpp b/lib/Sema/MiscDiagnostics.cpp
@@ -2839,7 +2839,7 @@ static void checkStmtConditionTrailingClosure(TypeChecker &TC, const Expr *E) {
       if (auto TT = argsTy->getAs<TupleType>()) {
         assert(TT->getNumElements() != 0 && "Unexpected empty TupleType");
         auto closureLabel = TT->getElement(TT->getNumElements() - 1).getName();
-        if(!closureLabel.empty()) {
+        if (!closureLabel.empty()) {
           replacement += closureLabel.str();
           replacement += ": ";
         }