Clean up some spacing.

Author: nickmshelley

SQLite/Core/Connection.swift

@@ -50,14 +50,14 @@ public enum TransactionMode : String {
 public protocol Connection {
 
     /// Whether or not the database was opened in a read-only state.
-    var readonly : Bool { get }
+    var readonly: Bool { get }
 
     /// The last rowid inserted into the database via this connection.
-    var lastInsertRowid : Int64? { get }
+    var lastInsertRowid: Int64? { get }
 
     /// The last number of changes (inserts, updates, or deletes) made to the
     /// database via this connection.
-    var changes : Int { get }
+    var changes: Int { get }
 
     /// The total number of changes (inserts, updates, or deletes) made to the
     /// database via this connection.
@@ -808,7 +808,7 @@ public final class DirectConnection : Connection, Equatable {
         throw error
     }
 
-    private var dispatcher : Dispatcher
+    private var dispatcher: Dispatcher
 
 }
 

SQLite/Core/ConnectionPool.swift

@@ -38,11 +38,11 @@ private let vfsName = "unix-excl"
 // WAL mode.
 public final class ConnectionPool {
 
-    private let location : DirectConnection.Location
+    private let location: DirectConnection.Location
     private var availableReadConnections = [DirectConnection]()
     private var unavailableReadConnections = [DirectConnection]()
-    private let lockQueue : dispatch_queue_t
-    private var writeConnection : DirectConnection!
+    private let lockQueue: dispatch_queue_t
+    private var writeConnection: DirectConnection!
     private let connectionSemaphore = dispatch_semaphore_create(5)
 
     public var foreignKeys : Bool {
@@ -82,8 +82,8 @@ public final class ConnectionPool {
     // to the pool when it goes out of scope
     private class BorrowedConnection : Connection, Equatable {
 
-        let pool : ConnectionPool
-        let connection : DirectConnection
+        let pool: ConnectionPool
+        let connection: DirectConnection
 
         init(pool: ConnectionPool, connection: DirectConnection) {
             self.pool = pool
@@ -100,10 +100,10 @@ public final class ConnectionPool {
             }
         }
 
-        var readonly : Bool { return connection.readonly }
-        var lastInsertRowid : Int64? { return connection.lastInsertRowid }
-        var changes : Int { return connection.changes }
-        var totalChanges : Int { return connection.totalChanges }
+        var readonly: Bool { return connection.readonly }
+        var lastInsertRowid: Int64? { return connection.lastInsertRowid }
+        var changes: Int { return connection.changes }
+        var totalChanges: Int { return connection.totalChanges }
 
         func execute(SQL: String) throws { return try connection.execute(SQL) }
         @warn_unused_result func prepare(statement: String, _ bindings: Binding?...) throws -> Statement { return try connection.prepare(statement, bindings) }
@@ -131,7 +131,7 @@ public final class ConnectionPool {
 
     var writeConnectionInit = dispatch_once_t()
 
-    public var writable : DirectConnection {
+    public var writable: DirectConnection {
 
         dispatch_once(&writeConnectionInit) {
 
@@ -153,17 +153,17 @@ public final class ConnectionPool {
     }
 
     // Acquires a read only connection to the database
-    public var readable : Connection {
+    public var readable: Connection {
 
-        var borrowed : BorrowedConnection!
+        var borrowed: BorrowedConnection!
 
         dispatch_semaphore_wait(connectionSemaphore, DISPATCH_TIME_FOREVER)
         dispatch_sync(lockQueue) {
 
             // Ensure database is open
             self.writable
 
-            let connection : DirectConnection
+            let connection: DirectConnection
 
             if let availableConnection = self.availableReadConnections.popLast() {
                 connection = availableConnection

SQLite/Core/Dispatcher.swift

@@ -1,55 +1,71 @@
 //
-//  Dispatcher.swift
-//  SQLite
+// SQLite.swift
+// https://github.com/stephencelis/SQLite.swift
+// Copyright © 2014-2015 Stephen Celis.
 //
-//  Created by Kevin Wooten on 11/28/15.
-//  Copyright © 2015 stephencelis. All rights reserved.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 //
 
 import Foundation
 
 
 /// Block dispatch method
 public protocol Dispatcher {
-
-  /// Dispatches the provided block
-  func dispatch(block: dispatch_block_t)
-  
+    
+    /// Dispatches the provided block
+    func dispatch(block: dispatch_block_t)
+    
 }
 
 
 /// Dispatches block immediately on current thread
 public final class ImmediateDispatcher : Dispatcher {
-  
-  public func dispatch(block: dispatch_block_t) {
-    block()
-  }
-  
+    
+    public func dispatch(block: dispatch_block_t) {
+        block()
+    }
+    
 }
 
 
 /// Synchronously dispatches block on a serial
 /// queue. Specifically allows reentrant calls
 public final class ReentrantDispatcher : Dispatcher {
-  
-  static let queueKey = unsafeBitCast(ReentrantDispatcher.self, UnsafePointer<Void>.self)
-  
-  let queue : dispatch_queue_t
-  
-  let queueContext : UnsafeMutablePointer<Void>!
-  
-  public init(_ name: String) {
-    queue = dispatch_queue_create(name, DISPATCH_QUEUE_SERIAL)
-    queueContext = unsafeBitCast(queue, UnsafeMutablePointer<Void>.self)
-    dispatch_queue_set_specific(queue, ReentrantDispatcher.queueKey, queueContext, nil)
-  }
-  
-  public func dispatch(block: dispatch_block_t) {
-    if dispatch_get_specific(ReentrantDispatcher.queueKey) == self.queueContext {
-      block()
-    } else {
-      dispatch_sync(self.queue, block) // FIXME: rdar://problem/21389236
+    
+    static let queueKey = unsafeBitCast(ReentrantDispatcher.self, UnsafePointer<Void>.self)
+    
+    let queue : dispatch_queue_t
+    
+    let queueContext : UnsafeMutablePointer<Void>
+    
+    public init(_ name: String) {
+        queue = dispatch_queue_create(name, DISPATCH_QUEUE_SERIAL)
+        queueContext = unsafeBitCast(queue, UnsafeMutablePointer<Void>.self)
+        dispatch_queue_set_specific(queue, ReentrantDispatcher.queueKey, queueContext, nil)
+    }
+    
+    public func dispatch(block: dispatch_block_t) {
+        if dispatch_get_specific(ReentrantDispatcher.queueKey) == self.queueContext {
+            block()
+        } else {
+            dispatch_sync(self.queue, block) // FIXME: rdar://problem/21389236
+        }
     }
-  }
-  
+    
 }

SQLite/Typed/Query.swift

@@ -1051,7 +1051,6 @@ public struct Row {
     }
 
     // FIXME: rdar://problem/18673897 // subscript<T>…
-    
     public subscript(column: Expression<Blob>) -> Blob {
         return get(column)
     }