From 814ff86daf300f82c77b682e061b64d4d67ed9e6 Mon Sep 17 00:00:00 2001 From: "Robert F. Dickerson" Date: Sun, 31 Jul 2016 09:10:00 -0500 Subject: [PATCH] Fixed the tuple label error --- src/swift/Data.swift | 4 ++-- src/swift/IO.swift | 22 +++++++++++----------- src/swift/Wrapper.swift | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/swift/Data.swift b/src/swift/Data.swift index ca4c3e90e..dd03f21d6 100644 --- a/src/swift/Data.swift +++ b/src/swift/Data.swift @@ -86,13 +86,13 @@ public struct DispatchData : RandomAccessCollection { } public func enumerateBytes( - block: @noescape (_ buffer: UnsafeBufferPointer, _ byteIndex: Int, _ stop: inout Bool) -> Void) + block: @noescape ( buffer: UnsafeBufferPointer, byteIndex: Int, stop: inout Bool) -> Void) { _swift_dispatch_data_apply(__wrapped.__wrapped) { (data: dispatch_data_t, offset: Int, ptr: UnsafeRawPointer, size: Int) in let bytePtr = ptr.bindMemory(to: UInt8.self, capacity: size) let bp = UnsafeBufferPointer(start: bytePtr, count: size) var stop = false - block(bp, offset, &stop) + block(buffer: bp, byteIndex: offset, stop: &stop) return !stop } } diff --git a/src/swift/IO.swift b/src/swift/IO.swift index f7b8297f2..af5475385 100644 --- a/src/swift/IO.swift +++ b/src/swift/IO.swift @@ -34,15 +34,15 @@ public extension DispatchIO { public static let strictInterval = IntervalFlags(rawValue: 1) } - public class func read(fromFileDescriptor: Int32, maxLength: Int, runningHandlerOn queue: DispatchQueue, handler: (_ data: DispatchData, _ error: Int32) -> Void) { + public class func read(fromFileDescriptor: Int32, maxLength: Int, runningHandlerOn queue: DispatchQueue, handler: ( data: DispatchData, error: Int32) -> Void) { dispatch_read(fromFileDescriptor, maxLength, queue.__wrapped) { (data: dispatch_data_t, error: Int32) in - handler(DispatchData(data: data), error) + handler(data: DispatchData(data: data), error: error) } } - public class func write(toFileDescriptor: Int32, data: DispatchData, runningHandlerOn queue: DispatchQueue, handler: (_ data: DispatchData?, _ error: Int32) -> Void) { + public class func write(toFileDescriptor: Int32, data: DispatchData, runningHandlerOn queue: DispatchQueue, handler: ( data: DispatchData?, error: Int32) -> Void) { dispatch_write(toFileDescriptor, data.__wrapped.__wrapped, queue.__wrapped) { (data: dispatch_data_t?, error: Int32) in - handler(data.flatMap { DispatchData(data: $0) }, error) + handler(data: data.flatMap { DispatchData(data: $0) }, error: error) } } @@ -50,7 +50,7 @@ public extension DispatchIO { type: StreamType, fileDescriptor: Int32, queue: DispatchQueue, - cleanupHandler: (_ error: Int32) -> Void) + cleanupHandler: ( error: Int32) -> Void) { self.init(__type: type.rawValue, fd: fileDescriptor, queue: queue, handler: cleanupHandler) } @@ -61,7 +61,7 @@ public extension DispatchIO { oflag: Int32, mode: mode_t, queue: DispatchQueue, - cleanupHandler: (_ error: Int32) -> Void) + cleanupHandler: ( error: Int32) -> Void) { self.init(__type: type.rawValue, path: path, oflag: oflag, mode: mode, queue: queue, handler: cleanupHandler) } @@ -70,20 +70,20 @@ public extension DispatchIO { type: StreamType, io: DispatchIO, queue: DispatchQueue, - cleanupHandler: (_ error: Int32) -> Void) + cleanupHandler: ( error: Int32) -> Void) { self.init(__type: type.rawValue, io: io, queue: queue, handler: cleanupHandler) } - public func read(offset: off_t, length: Int, queue: DispatchQueue, ioHandler: (_ done: Bool, _ data: DispatchData?, _ error: Int32) -> Void) { + public func read(offset: off_t, length: Int, queue: DispatchQueue, ioHandler: ( done: Bool, data: DispatchData?, error: Int32) -> Void) { dispatch_io_read(self.__wrapped, offset, length, queue.__wrapped) { (done: Bool, data: dispatch_data_t?, error: Int32) in - ioHandler(done, data.flatMap { DispatchData(data: $0) }, error) + ioHandler(done: done, data: data.flatMap { DispatchData(data: $0) }, error: error) } } - public func write(offset: off_t, data: DispatchData, queue: DispatchQueue, ioHandler: (_ done: Bool, _ data: DispatchData?, _ error: Int32) -> Void) { + public func write(offset: off_t, data: DispatchData, queue: DispatchQueue, ioHandler: ( done: Bool, data: DispatchData?, error: Int32) -> Void) { dispatch_io_write(self.__wrapped, offset, data.__wrapped.__wrapped, queue.__wrapped) { (done: Bool, data: dispatch_data_t?, error: Int32) in - ioHandler(done, data.flatMap { DispatchData(data: $0) }, error) + ioHandler(done: done, data: data.flatMap { DispatchData(data: $0) }, error: error) } } diff --git a/src/swift/Wrapper.swift b/src/swift/Wrapper.swift index 72cba30db..4ee90f043 100644 --- a/src/swift/Wrapper.swift +++ b/src/swift/Wrapper.swift @@ -91,17 +91,17 @@ public class DispatchIO : DispatchObject { } internal init(__type: UInt, fd: Int32, queue: DispatchQueue, - handler: (_ error: Int32) -> Void) { + handler: (error: Int32) -> Void) { __wrapped = dispatch_io_create(__type, fd, queue.__wrapped, handler) } internal init(__type: UInt, path: UnsafePointer, oflag: Int32, - mode: mode_t, queue: DispatchQueue, handler: (_ error: Int32) -> Void) { + mode: mode_t, queue: DispatchQueue, handler: (error: Int32) -> Void) { __wrapped = dispatch_io_create_with_path(__type, path, oflag, mode, queue.__wrapped, handler) } internal init(__type: UInt, io: DispatchIO, - queue: DispatchQueue, handler: (_ error: Int32) -> Void) { + queue: DispatchQueue, handler: (error: Int32) -> Void) { __wrapped = dispatch_io_create_with_io(__type, io.__wrapped, queue.__wrapped, handler) }