Merge pull request #5344 from karwa/clearspecific

slavapestov · web-flow · commit 5accebf556f4 · 2017-01-18T15:59:45.000-08:00
[Overlay/Dispatch]: Change DispatchQueue.setSpecific to take an optional
diff --git a/stdlib/public/SDK/Dispatch/Queue.swift b/stdlib/public/SDK/Dispatch/Queue.swift
@@ -340,10 +340,10 @@ public extension DispatchQueue {
 		return nil
 	}
 
-	public func setSpecific<T>(key: DispatchSpecificKey<T>, value: T) {
-		let v = _DispatchSpecificValue(value: value)
+	public func setSpecific<T>(key: DispatchSpecificKey<T>, value: T?) {
 		let k = Unmanaged.passUnretained(key).toOpaque()
-		let p = Unmanaged.passRetained(v).toOpaque()
+		let v = value.flatMap { _DispatchSpecificValue(value: $0) }
+		let p = v.flatMap { Unmanaged.passRetained($0).toOpaque() }
 		__dispatch_queue_set_specific(self, k, p, _destructDispatchSpecificValue)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -340,10 +340,10 @@ public extension DispatchQueue {`
`340`	`340`	`return nil`
`341`	`341`	`}`
`342`	`342`
`343`		`- public func setSpecific<T>(key: DispatchSpecificKey<T>, value: T) {`
`344`		`- let v = _DispatchSpecificValue(value: value)`
	`343`	`+ public func setSpecific<T>(key: DispatchSpecificKey<T>, value: T?) {`
`345`	`344`	`let k = Unmanaged.passUnretained(key).toOpaque()`
`346`		`- let p = Unmanaged.passRetained(v).toOpaque()`
	`345`	`+ let v = value.flatMap { _DispatchSpecificValue(value: $0) }`
	`346`	`+ let p = v.flatMap { Unmanaged.passRetained($0).toOpaque() }`
`347`	`347`	`__dispatch_queue_set_specific(self, k, p, _destructDispatchSpecificValue)`
`348`	`348`	`}`
`349`	`349`	`}`