Merge remote-tracking branch 'upstream/master'

Author: Mohit Athwani

Foundation/NSError.swift

@@ -377,8 +377,8 @@ extension __BridgedNSError where Self: RawRepresentable, Self.RawValue: SignedIn
 }
 
 public extension __BridgedNSError where Self: RawRepresentable, Self.RawValue: SignedInteger {
-    public final var _domain: String { return Self._nsErrorDomain }
-    public final var _code: Int { return Int(rawValue.toIntMax()) }
+    public var _domain: String { return Self._nsErrorDomain }
+    public var _code: Int { return Int(rawValue.toIntMax()) }
 
     public init?(rawValue: RawValue) {
         self = unsafeBitCast(rawValue, to: Self.self)
@@ -392,7 +392,7 @@ public extension __BridgedNSError where Self: RawRepresentable, Self.RawValue: S
         self.init(rawValue: RawValue(IntMax(_bridgedNSError.code)))
     }
 
-    public final var hashValue: Int { return _code }
+    public var hashValue: Int { return _code }
 }
 
 // Allow two bridged NSError types to be compared.
@@ -403,8 +403,8 @@ extension __BridgedNSError where Self: RawRepresentable, Self.RawValue: Unsigned
 }
 
 public extension __BridgedNSError where Self: RawRepresentable, Self.RawValue: UnsignedInteger {
-    public final var _domain: String { return Self._nsErrorDomain }
-    public final var _code: Int {
+    public var _domain: String { return Self._nsErrorDomain }
+    public var _code: Int {
         return Int(bitPattern: UInt(rawValue.toUIntMax()))
     }
 
@@ -420,7 +420,7 @@ public extension __BridgedNSError where Self: RawRepresentable, Self.RawValue: U
         self.init(rawValue: RawValue(UIntMax(UInt(_bridgedNSError.code))))
     }
 
-    public final var hashValue: Int { return _code }
+    public var hashValue: Int { return _code }
 }
 
 /// Describes a raw representable type that is bridged to a particular

Foundation/NSOrderedSet.swift

@@ -148,7 +148,7 @@ extension NSOrderedSet {
     open func objects(at indexes: IndexSet) -> [Any] {
         var entries = [Any]()
         for idx in indexes {
-            if idx >= count && idx < 0 {
+            guard idx < count && idx >= 0 else {
                 fatalError("\(self): Index out of bounds")
             }
             entries.append(object(at: idx))
@@ -338,12 +338,12 @@ extension NSOrderedSet {
 open class NSMutableOrderedSet : NSOrderedSet {
 
     open func insert(_ object: Any, at idx: Int) {
-        guard idx < count && idx >= 0 else {
+        guard idx <= count && idx >= 0 else {
             fatalError("\(self): Index out of bounds")
         }
 
         let value = _SwiftValue.store(object)
-        
+
         if contains(value) {
             return
         }

Foundation/Progress.swift

@@ -292,8 +292,8 @@ open class Progress : NSObject {
     open var pausingHandler: (() -> Void)? {
         didSet {
             guard let handler = pausingHandler else { return }
-            // If we're already cancelled, then invoke it - asynchronously
-            if isCancelled {
+            // If we're already paused, then invoke it - asynchronously
+            if isPaused {
                 DispatchQueue.global().async {
                     handler()
                 }

TestFoundation/TestNSOrderedSet.swift

@@ -43,7 +43,8 @@ class TestNSOrderedSet : XCTestCase {
             ("test_ReplaceObject", test_ReplaceObject),
             ("test_ExchangeObjects", test_ExchangeObjects),
             ("test_MoveObjects", test_MoveObjects),
-            ("test_InserObjects", test_InsertObjects),
+            ("test_InsertObjects", test_InsertObjects),
+            ("test_Insert", test_Insert),
             ("test_SetObjectAtIndex", test_SetObjectAtIndex),
             ("test_RemoveObjectsInRange", test_RemoveObjectsInRange),
             ("test_ReplaceObjectsAtIndexes", test_ReplaceObjectsAtIndexes),
@@ -252,6 +253,16 @@ class TestNSOrderedSet : XCTestCase {
         XCTAssertEqual(set[4] as? String, "baz")
     }
 
+    func test_Insert() {
+        let set = NSMutableOrderedSet()
+        set.insert("foo", at: 0)
+        XCTAssertEqual(set.count, 1)
+        XCTAssertEqual(set[0] as? String, "foo")
+        set.insert("bar", at: 1)
+        XCTAssertEqual(set.count, 2)
+        XCTAssertEqual(set[1] as? String, "bar")
+    }
+
     func test_SetObjectAtIndex() {
         let set = NSMutableOrderedSet(arrayLiteral: "foo", "bar", "baz")
         set.setObject("123", at: 1)