Merge pull request swiftlang#1074 from spevans/pr_range_deprecation

Author: swift-ci

Foundation/Calendar.swift

@@ -367,7 +367,7 @@ public struct Calendar : Hashable, Equatable, ReferenceConvertible, _MutableBoxi
     /// - parameter component: A component to calculate a range for.
     /// - returns: The range, or nil if it could not be calculated.
     public func minimumRange(of component: Component) -> Range<Int>? {
-        return _handle.map { $0.minimumRange(of: Calendar._toCalendarUnit([component])).toRange() }
+        return _handle.map { Range($0.minimumRange(of: Calendar._toCalendarUnit([component]))) }
     }
 
     /// The maximum range limits of the values that a given component can take on in the receive
@@ -376,7 +376,7 @@ public struct Calendar : Hashable, Equatable, ReferenceConvertible, _MutableBoxi
     /// - parameter component: A component to calculate a range for.
     /// - returns: The range, or nil if it could not be calculated.
     public func maximumRange(of component: Component) -> Range<Int>? {
-        return _handle.map { $0.maximumRange(of: Calendar._toCalendarUnit([component])).toRange() }
+        return _handle.map { Range($0.maximumRange(of: Calendar._toCalendarUnit([component]))) }
     }
 
 
@@ -393,7 +393,7 @@ public struct Calendar : Hashable, Equatable, ReferenceConvertible, _MutableBoxi
     /// - parameter date: The absolute time for which the calculation is performed.
     /// - returns: The range of absolute time values smaller can take on in larger at the time specified by date. Returns `nil` if larger is not logically bigger than smaller in the calendar, or the given combination of components does not make sense (or is a computation which is undefined).
     public func range(of smaller: Component, in larger: Component, for date: Date) -> Range<Int>? {
-        return _handle.map { $0.range(of: Calendar._toCalendarUnit([smaller]), in: Calendar._toCalendarUnit([larger]), for: date).toRange() }
+        return _handle.map { Range($0.range(of: Calendar._toCalendarUnit([smaller]), in: Calendar._toCalendarUnit([larger]), for: date)) }
     }
 
     /// Returns, via two inout parameters, the starting time and duration of a given calendar component that contains a given date.

Foundation/NSArray.swift

@@ -238,7 +238,7 @@ open class NSArray : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSCo
         objects.reserveCapacity(objects.count + range.length)
 
         if type(of: self) === NSArray.self || type(of: self) === NSMutableArray.self {
-            objects += _storage[range.toRange()!].map { _SwiftValue.fetch(nonOptional: $0) }
+            objects += _storage[Range(range)!].map { _SwiftValue.fetch(nonOptional: $0) }
             return
         }
 
@@ -495,7 +495,7 @@ open class NSArray : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSCo
             return []
         }
 
-        let swiftRange = range.toRange()!
+        let swiftRange = Range(range)!
         return allObjects[swiftRange].sorted { lhs, rhs in
             return cmptr(lhs, rhs) == .orderedAscending
         }
@@ -784,7 +784,7 @@ open class NSMutableArray : NSArray {
 
     open func removeObjects(in range: NSRange) {
         if type(of: self) === NSMutableArray.self {
-            _storage.removeSubrange(range.toRange()!)
+            _storage.removeSubrange(Range(range)!)
         } else {
             for idx in range.toCountableRange()!.reversed() {
                 removeObject(at: idx)

Foundation/NSData.swift

@@ -569,7 +569,7 @@ open class NSData : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
     open func range(of dataToFind: Data, options mask: SearchOptions = [], in searchRange: NSRange) -> NSRange {
         let dataToFind = dataToFind._nsObject
         guard dataToFind.length > 0 else {return NSRange(location: NSNotFound, length: 0)}
-        guard let searchRange = searchRange.toRange() else {fatalError("invalid range")}
+        guard let searchRange = Range(searchRange) else {fatalError("invalid range")}
 
         precondition(searchRange.upperBound <= self.length, "range outside the bounds of data")
 

Foundation/NSOrderedSet.swift

@@ -553,7 +553,7 @@ extension NSMutableOrderedSet {
             NSUnimplemented()
         }
 
-        let swiftRange = range.toRange()!
+        let swiftRange = Range(range)!
         _orderedStorage[swiftRange].sort { lhs, rhs in
             return cmptr(_SwiftValue.fetch(nonOptional: lhs), _SwiftValue.fetch(nonOptional: rhs)) == .orderedAscending
         }

TestFoundation/TestNSRange.swift

@@ -68,7 +68,7 @@ class TestNSRange : XCTestCase {
     func test_NSRangeBridging() {
         let swiftRange: Range<Int> = 1..<7
         let range = NSRange(swiftRange)
-        let swiftRange2 = range.toRange()
+        let swiftRange2 = Range(range)
         XCTAssertEqual(swiftRange, swiftRange2)
     }