Merge pull request swiftlang#2184 from spevans/pr_deprecated_scanner

Update to newer Scanner methods.

Author: spevans

Foundation/NSGeometry.swift

@@ -990,12 +990,12 @@ private func _scanDoublesFromString(_ aString: String, number: Int) -> [Double]
     var result = [Double](repeating: 0.0, count: number)
     var index = 0
 
-    let _ = scanner.scanUpToCharactersFromSet(digitSet)
+    let _ = scanner.scanUpToCharacters(from: digitSet)
     while !scanner.isAtEnd && index < number {
         if let num = scanner.scanDouble() {
             result[index] = num
         }
-        let _ = scanner.scanUpToCharactersFromSet(digitSet)
+        let _ = scanner.scanUpToCharacters(from: digitSet)
         index += 1
     }
 

Foundation/NSRange.swift

@@ -94,7 +94,7 @@ public func NSRangeFromString(_ aString: String) -> NSRange {
     }
     let scanner = Scanner(string: aString)
     let digitSet = CharacterSet.decimalDigits
-    let _ = scanner.scanUpToCharactersFromSet(digitSet)
+    let _ = scanner.scanUpToCharacters(from: digitSet)
     if scanner.isAtEnd {
         // fail early if there are no decimal digits
         return emptyRange
@@ -107,7 +107,7 @@ public func NSRangeFromString(_ aString: String) -> NSRange {
         // return early if there are no more characters after the first int in the string
         return partialRange
     }
-    let _ = scanner.scanUpToCharactersFromSet(digitSet)
+    let _ = scanner.scanUpToCharacters(from: digitSet)
     if scanner.isAtEnd {
         // return early if there are no integer characters after the first int in the string
         return partialRange
@@ -152,7 +152,7 @@ extension NSRange {
         }
         let scanner = Scanner(string: string)
         let digitSet = CharacterSet.decimalDigits
-        let _ = scanner.scanUpToCharacters(from: digitSet, into: nil)
+        let _ = scanner.scanUpToCharacters(from: digitSet)
         if scanner.isAtEnd {
             // fail early if there are no decimal digits
             return nil
@@ -166,7 +166,7 @@ extension NSRange {
             // return early if there are no more characters after the first int in the string
             return nil
         }
-        if scanner.scanString(".", into: nil) {
+        if scanner.scanString(".") != nil {
             scanner.scanLocation = savedLocation
             var double = 0.0
             guard scanner.scanDouble(&double) else {
@@ -178,7 +178,7 @@ extension NSRange {
             location = integral
         }
 
-        let _ = scanner.scanUpToCharacters(from: digitSet, into: nil)
+        let _ = scanner.scanUpToCharacters(from: digitSet)
         if scanner.isAtEnd {
             // return early if there are no integer characters after the first int in the string
             return nil
@@ -190,7 +190,7 @@ extension NSRange {
         }
 
         if !scanner.isAtEnd {
-            if scanner.scanString(".", into: nil) {
+            if scanner.scanString(".") != nil {
                 scanner.scanLocation = savedLocation
                 var double = 0.0
                 guard scanner.scanDouble(&double) else {

Foundation/NSString.swift

@@ -667,9 +667,9 @@ extension NSString {
     public var boolValue: Bool {
         let scanner = Scanner(string: _swiftObject)
         // skip initial whitespace if present
-        let _ = scanner.scanCharactersFromSet(.whitespaces)
+        let _ = scanner.scanCharacters(from: .whitespaces)
 
-        if scanner.scanCharactersFromSet(CharacterSet(charactersIn: "tTyY")) != nil {
+        if scanner.scanCharacters(from: CharacterSet(charactersIn: "tTyY")) != nil {
             return true
         }
 
@@ -679,8 +679,8 @@ extension NSString {
         }
 
         // scan any following zeroes
-        let _ = scanner.scanCharactersFromSet(CharacterSet(charactersIn: "0"))
-        return scanner.scanCharactersFromSet(CharacterSet(charactersIn: "123456789")) != nil
+        let _ = scanner.scanCharacters(from: CharacterSet(charactersIn: "0"))
+        return scanner.scanCharacters(from: CharacterSet(charactersIn: "123456789")) != nil
     }
 
     public var uppercased: String {