Merge pull request #1463 from aschwaighofer/fix_withoutActuallyEscaping_usage

NSDictionary, NSIndexSet: Fix withoutAcutallyEscaping usage

Author: DougGregor

Foundation/NSDictionary.swift

@@ -483,8 +483,8 @@ open class NSDictionary : NSObject, NSCopying, NSMutableCopying, NSSecureCoding,
         let lock = NSLock()
 
         getObjects(&objects, andKeys: &keys, count: count)
-        let iteration: (Int) -> Void = withoutActuallyEscaping(block) { (closure: @escaping (Any, Any, UnsafeMutablePointer<ObjCBool>) -> Void) -> (Int) -> Void in
-            return { (idx) in
+        withoutActuallyEscaping(block) { (closure: @escaping (Any, Any, UnsafeMutablePointer<ObjCBool>) -> Void) -> () in
+            let iteration: (Int) -> Void = { (idx) in
                 lock.lock()
                 var stop = sharedStop
                 lock.unlock()
@@ -499,13 +499,13 @@ open class NSDictionary : NSObject, NSCopying, NSMutableCopying, NSSecureCoding,
                     return
                 }
             }
-        }
-        
-        if opts.contains(.concurrent) {
-            DispatchQueue.concurrentPerform(iterations: count, execute: iteration)
-        } else {
-            for idx in 0..<count {
-                iteration(idx)
+
+            if opts.contains(.concurrent) {
+                DispatchQueue.concurrentPerform(iterations: count, execute: iteration)
+            } else {
+                for idx in 0..<count {
+                    iteration(idx)
+                }
             }
         }
     }

Foundation/NSIndexSet.swift

@@ -389,8 +389,8 @@ open class NSIndexSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
         let lock = NSLock()
         let ranges = _ranges[startRangeIndex...endRangeIndex]
         let rangeSequence = (reverse ? AnyCollection(ranges.reversed()) : AnyCollection(ranges))
-        let iteration = withoutActuallyEscaping(block) { (closure: @escaping (P, UnsafeMutablePointer<ObjCBool>) -> R) -> (Int) -> Void in
-            return { (rangeIdx) in
+        withoutActuallyEscaping(block) { (closure: @escaping (P, UnsafeMutablePointer<ObjCBool>) -> R) -> () in
+            let iteration : (Int) -> Void = { (rangeIdx) in
                 lock.lock()
                 var stop = ObjCBool(sharedStop)
                 lock.unlock()
@@ -431,13 +431,12 @@ open class NSIndexSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
                     }
                 }
             }
-        }
-        
-        if opts.contains(.concurrent) {
-            DispatchQueue.concurrentPerform(iterations: Int(rangeSequence.count), execute: iteration)
-        } else {
-            for idx in 0..<Int(rangeSequence.count) {
-                iteration(idx)
+            if opts.contains(.concurrent) {
+                DispatchQueue.concurrentPerform(iterations: Int(rangeSequence.count), execute: iteration)
+            } else {
+                for idx in 0..<Int(rangeSequence.count) {
+                    iteration(idx)
+                }
             }
         }