Merge pull request #346 from ikesyo/optional-map-over-flatmap
[gardening] Use `Optional.map` over `flatMap` where appropriate
diff --git a/src/swift/IO.swift b/src/swift/IO.swift
index d26f641..6d5ec3b 100644
--- a/src/swift/IO.swift
+++ b/src/swift/IO.swift
@@ -42,7 +42,7 @@
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 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 4498318..f20dbbc 100644
--- a/src/swift/Queue.swift
+++ b/src/swift/Queue.swift
@@ -329,8 +329,8 @@
public func setSpecific<T>(key: DispatchSpecificKey<T>, 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)
}
