From ed92023477e19da8e1adefcb417f4559027825f7 Mon Sep 17 00:00:00 2001 From: Sho Ikeda Date: Sat, 10 Mar 2018 23:58:39 +0900 Subject: [PATCH] [Dispatch][gardening] Use `Optional.map` over `flatMap` where appropriate The initializers used here are not optional ones, so there is no need to use `flatMap`. --- src/swift/IO.swift | 6 +++--- src/swift/Queue.swift | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/swift/IO.swift b/src/swift/IO.swift index d26f64160..6d5ec3b6d 100644 --- a/src/swift/IO.swift +++ b/src/swift/IO.swift @@ -42,7 +42,7 @@ public extension DispatchIO { public class func write(toFileDescriptor: Int32, data: DispatchData, runningHandlerOn queue: DispatchQueue, handler: @escaping (_ data: DispatchData?, _ error: Int32) -> Void) { dispatch_write(toFileDescriptor, data.__wrapped.__wrapped, queue.__wrapped) { (data: dispatch_data_t?, error: Int32) in - handler(data.flatMap { DispatchData(borrowedData: $0) }, error) + handler(data.map { DispatchData(borrowedData: $0) }, error) } } @@ -90,13 +90,13 @@ public extension DispatchIO { public func read(offset: off_t, length: Int, queue: DispatchQueue, ioHandler: @escaping (_ 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(borrowedData: $0) }, error) + ioHandler(done, data.map { DispatchData(borrowedData: $0) }, error) } } public func write(offset: off_t, data: DispatchData, queue: DispatchQueue, ioHandler: @escaping (_ 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(borrowedData: $0) }, error) + ioHandler(done, data.map { DispatchData(borrowedData: $0) }, error) } } diff --git a/src/swift/Queue.swift b/src/swift/Queue.swift index bd79a853c..c2ad7c246 100644 --- a/src/swift/Queue.swift +++ b/src/swift/Queue.swift @@ -329,8 +329,8 @@ public extension DispatchQueue { public func setSpecific(key: DispatchSpecificKey, value: T?) { let k = Unmanaged.passUnretained(key).toOpaque() - let v = value.flatMap { _DispatchSpecificValue(value: $0) } - let p = v.flatMap { Unmanaged.passRetained($0).toOpaque() } + let v = value.map { _DispatchSpecificValue(value: $0) } + let p = v.map { Unmanaged.passRetained($0).toOpaque() } dispatch_queue_set_specific(self.__wrapped, k, p, _destructDispatchSpecificValue) }