Merge PR 331

parkera · parkera · commit 8471a356519f · 2016-04-27T17:48:19.000-06:00
diff --git a/Foundation/NSCharacterSet.swift b/Foundation/NSCharacterSet.swift
@@ -65,63 +65,63 @@ public class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSCoding {
         _CFDeinit(self)
     }
     
-    public class func controlCharacterSet() -> NSCharacterSet {
+    public class func controlCharacters() -> NSCharacterSet {
         return CFCharacterSetGetPredefined(kCFCharacterSetControl)._nsObject
     }
     
-    public class func whitespaceCharacterSet() -> NSCharacterSet {
+    public class func whitespaces() -> NSCharacterSet {
         return CFCharacterSetGetPredefined(kCFCharacterSetWhitespace)._nsObject
     }
 
-    public class func whitespaceAndNewlineCharacterSet() -> NSCharacterSet {
+    public class func whitespacesAndNewlines() -> NSCharacterSet {
         return CFCharacterSetGetPredefined(kCFCharacterSetWhitespaceAndNewline)._nsObject
     }
     
-    public class func decimalDigitCharacterSet() -> NSCharacterSet {
+    public class func decimalDigits() -> NSCharacterSet {
         return CFCharacterSetGetPredefined(kCFCharacterSetDecimalDigit)._nsObject
     }
     
-    public class func letterCharacterSet() -> NSCharacterSet {
+    public class func letters() -> NSCharacterSet {
         return CFCharacterSetGetPredefined(kCFCharacterSetLetter)._nsObject
     }
     
-    public class func lowercaseLetterCharacterSet() -> NSCharacterSet {
+    public class func lowercaseLetters() -> NSCharacterSet {
         return CFCharacterSetGetPredefined(kCFCharacterSetLowercaseLetter)._nsObject
     }
     
-    public class func uppercaseLetterCharacterSet() -> NSCharacterSet {
+    public class func uppercaseLetters() -> NSCharacterSet {
         return CFCharacterSetGetPredefined(kCFCharacterSetUppercaseLetter)._nsObject
     }
     
-    public class func nonBaseCharacterSet() -> NSCharacterSet {
+    public class func nonBaseCharacters() -> NSCharacterSet {
         return CFCharacterSetGetPredefined(kCFCharacterSetNonBase)._nsObject
     }
     
-    public class func alphanumericCharacterSet() -> NSCharacterSet {
+    public class func alphanumerics() -> NSCharacterSet {
         return CFCharacterSetGetPredefined(kCFCharacterSetAlphaNumeric)._nsObject
     }
     
-    public class func decomposableCharacterSet() -> NSCharacterSet {
+    public class func decomposables() -> NSCharacterSet {
         return CFCharacterSetGetPredefined(kCFCharacterSetDecomposable)._nsObject
     }
     
-    public class func illegalCharacterSet() -> NSCharacterSet {
+    public class func illegalCharacters() -> NSCharacterSet {
         return CFCharacterSetGetPredefined(kCFCharacterSetIllegal)._nsObject
     }
     
-    public class func punctuationCharacterSet() -> NSCharacterSet {
+    public class func punctuation() -> NSCharacterSet {
         return CFCharacterSetGetPredefined(kCFCharacterSetPunctuation)._nsObject
     }
     
-    public class func capitalizedLetterCharacterSet() -> NSCharacterSet {
+    public class func capitalizedLetters() -> NSCharacterSet {
         return CFCharacterSetGetPredefined(kCFCharacterSetCapitalizedLetter)._nsObject
     }
     
-    public class func symbolCharacterSet() -> NSCharacterSet {
+    public class func symbols() -> NSCharacterSet {
         return CFCharacterSetGetPredefined(kCFCharacterSetSymbol)._nsObject
     }
     
-    public class func newlineCharacterSet() -> NSCharacterSet {
+    public class func newlines() -> NSCharacterSet {
         return CFCharacterSetGetPredefined(kCFCharacterSetNewline)._nsObject
     }
 
@@ -130,7 +130,7 @@ public class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSCoding {
         _CFCharacterSetInitWithCharactersInRange(_cfMutableObject, CFRangeMake(aRange.location, aRange.length))
     }
     
-    public init(charactersInString aString: String) {
+    public init(charactersIn aString: String) {
         super.init()
         _CFCharacterSetInitWithCharactersInString(_cfMutableObject, aString._cfObject)
     }
@@ -149,7 +149,7 @@ public class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSCoding {
     }
     
     public convenience required init(coder aDecoder: NSCoder) {
-        self.init(charactersInString: "")
+        self.init(charactersIn: "")
     }
     
     public func characterIsMember(_ aCharacter: unichar) -> Bool {
@@ -203,92 +203,92 @@ public class NSMutableCharacterSet : NSCharacterSet {
         NSUnimplemented()
     }
     
-    public func addCharactersInRange(_ aRange: NSRange) {
+    public func addCharacters(in aRange: NSRange) {
         CFCharacterSetAddCharactersInRange(_cfMutableObject , CFRangeMake(aRange.location, aRange.length))
     }
     
-    public func removeCharactersInRange(_ aRange: NSRange) {
+    public func removeCharacters(in aRange: NSRange) {
         CFCharacterSetRemoveCharactersInRange(_cfMutableObject , CFRangeMake(aRange.location, aRange.length))
     }
     
-    public func addCharactersInString(_ aString: String) {
+    public func addCharacters(in aString: String) {
         CFCharacterSetAddCharactersInString(_cfMutableObject, aString._cfObject)
     }
     
-    public func removeCharactersInString(_ aString: String) {
+    public func removeCharacters(in aString: String) {
         CFCharacterSetRemoveCharactersInString(_cfMutableObject, aString._cfObject)
     }
     
-    public func formUnionWithCharacterSet(_ otherSet: NSCharacterSet) {
+    public func formUnion(with otherSet: NSCharacterSet) {
         CFCharacterSetUnion(_cfMutableObject, otherSet._cfObject)
     }
     
-    public func formIntersectionWithCharacterSet(_ otherSet: NSCharacterSet) {
+    public func formIntersection(with otherSet: NSCharacterSet) {
         CFCharacterSetIntersect(_cfMutableObject, otherSet._cfObject)
     }
     
     public func invert() {
         CFCharacterSetInvert(_cfMutableObject)
     }
 
-    public override class func controlCharacterSet() -> NSMutableCharacterSet {
-        return NSCharacterSet.controlCharacterSet().mutableCopy() as! NSMutableCharacterSet
+    public override class func controlCharacters() -> NSMutableCharacterSet {
+        return NSCharacterSet.controlCharacters().mutableCopy() as! NSMutableCharacterSet
     }
     
-    public override class func whitespaceCharacterSet() -> NSMutableCharacterSet {
-        return NSCharacterSet.whitespaceCharacterSet().mutableCopy() as! NSMutableCharacterSet
+    public override class func whitespaces() -> NSMutableCharacterSet {
+        return NSCharacterSet.whitespaces().mutableCopy() as! NSMutableCharacterSet
     }
     
-    public override class func whitespaceAndNewlineCharacterSet() -> NSMutableCharacterSet {
-        return NSCharacterSet.whitespaceAndNewlineCharacterSet().mutableCopy() as! NSMutableCharacterSet
+    public override class func whitespacesAndNewlines() -> NSMutableCharacterSet {
+        return NSCharacterSet.whitespacesAndNewlines().mutableCopy() as! NSMutableCharacterSet
     }
     
-    public override class func decimalDigitCharacterSet() -> NSMutableCharacterSet {
-        return NSCharacterSet.decimalDigitCharacterSet().mutableCopy() as! NSMutableCharacterSet
+    public override class func decimalDigits() -> NSMutableCharacterSet {
+        return NSCharacterSet.decimalDigits().mutableCopy() as! NSMutableCharacterSet
     }
     
-    public override class func letterCharacterSet() -> NSMutableCharacterSet {
-        return NSCharacterSet.letterCharacterSet().mutableCopy() as! NSMutableCharacterSet
+    public override class func letters() -> NSMutableCharacterSet {
+        return NSCharacterSet.letters().mutableCopy() as! NSMutableCharacterSet
     }
     
-    public override class func lowercaseLetterCharacterSet() -> NSMutableCharacterSet {
-        return NSCharacterSet.lowercaseLetterCharacterSet().mutableCopy() as! NSMutableCharacterSet
+    public override class func lowercaseLetters() -> NSMutableCharacterSet {
+        return NSCharacterSet.lowercaseLetters().mutableCopy() as! NSMutableCharacterSet
     }
     
-    public override class func uppercaseLetterCharacterSet() -> NSMutableCharacterSet {
-        return NSCharacterSet.uppercaseLetterCharacterSet().mutableCopy() as! NSMutableCharacterSet
+    public override class func uppercaseLetters() -> NSMutableCharacterSet {
+        return NSCharacterSet.uppercaseLetters().mutableCopy() as! NSMutableCharacterSet
     }
     
-    public override class func nonBaseCharacterSet() -> NSMutableCharacterSet {
-        return NSCharacterSet.nonBaseCharacterSet().mutableCopy() as! NSMutableCharacterSet
+    public override class func nonBaseCharacters() -> NSMutableCharacterSet {
+        return NSCharacterSet.nonBaseCharacters().mutableCopy() as! NSMutableCharacterSet
     }
     
-    public override class func alphanumericCharacterSet() -> NSMutableCharacterSet {
-        return NSCharacterSet.alphanumericCharacterSet().mutableCopy() as! NSMutableCharacterSet
+    public override class func alphanumerics() -> NSMutableCharacterSet {
+        return NSCharacterSet.alphanumerics().mutableCopy() as! NSMutableCharacterSet
     }
     
-    public override class func decomposableCharacterSet() -> NSMutableCharacterSet {
-        return NSCharacterSet.decomposableCharacterSet().mutableCopy() as! NSMutableCharacterSet
+    public override class func decomposables() -> NSMutableCharacterSet {
+        return NSCharacterSet.decomposables().mutableCopy() as! NSMutableCharacterSet
     }
     
-    public override class func illegalCharacterSet() -> NSMutableCharacterSet {
-        return NSCharacterSet.illegalCharacterSet().mutableCopy() as! NSMutableCharacterSet
+    public override class func illegalCharacters() -> NSMutableCharacterSet {
+        return NSCharacterSet.illegalCharacters().mutableCopy() as! NSMutableCharacterSet
     }
     
-    public override class func punctuationCharacterSet() -> NSMutableCharacterSet {
-        return NSCharacterSet.punctuationCharacterSet().mutableCopy() as! NSMutableCharacterSet
+    public override class func punctuation() -> NSMutableCharacterSet {
+        return NSCharacterSet.punctuation().mutableCopy() as! NSMutableCharacterSet
     }
     
-    public override class func capitalizedLetterCharacterSet() -> NSMutableCharacterSet {
-        return NSCharacterSet.capitalizedLetterCharacterSet().mutableCopy() as! NSMutableCharacterSet
+    public override class func capitalizedLetters() -> NSMutableCharacterSet {
+        return NSCharacterSet.capitalizedLetters().mutableCopy() as! NSMutableCharacterSet
     }
     
-    public override class func symbolCharacterSet() -> NSMutableCharacterSet {
-        return NSCharacterSet.symbolCharacterSet().mutableCopy() as! NSMutableCharacterSet
+    public override class func symbols() -> NSMutableCharacterSet {
+        return NSCharacterSet.symbols().mutableCopy() as! NSMutableCharacterSet
     }
     
-    public override class func newlineCharacterSet() -> NSMutableCharacterSet {
-        return NSCharacterSet.newlineCharacterSet().mutableCopy() as! NSMutableCharacterSet
+    public override class func newlines() -> NSMutableCharacterSet {
+        return NSCharacterSet.newlines().mutableCopy() as! NSMutableCharacterSet
     }
 }
 
diff --git a/Foundation/NSGeometry.swift b/Foundation/NSGeometry.swift
@@ -782,8 +782,8 @@ public func NSStringFromRect(_ aRect: NSRect) -> String {
 
 private func _scanDoublesFromString(_ aString: String, number: Int) -> [Double] {
     let scanner = NSScanner(string: aString)
-    let digitSet = NSMutableCharacterSet.decimalDigitCharacterSet()
-    digitSet.addCharactersInString("-")
+    let digitSet = NSMutableCharacterSet.decimalDigits()
+    digitSet.addCharacters(in: "-")
     var result = [Double](repeating: 0.0, count: number)
     var index = 0
     
diff --git a/Foundation/NSRange.swift b/Foundation/NSRange.swift
@@ -181,7 +181,7 @@ public func NSRangeFromString(_ aString: String) -> NSRange {
         return emptyRange
     }
     let scanner = NSScanner(string: aString)
-    let digitSet = NSCharacterSet.decimalDigitCharacterSet()
+    let digitSet = NSCharacterSet.decimalDigits()
     scanner.scanUpToCharactersFromSet(digitSet)
     if scanner.atEnd {
         // fail early if there are no decimal digits
diff --git a/Foundation/NSRegularExpression.swift b/Foundation/NSRegularExpression.swift
@@ -259,7 +259,7 @@ extension NSRegularExpression {
     public func replacementString(for result: NSTextCheckingResult, in string: String, offset: Int, template templ: String) -> String {
         // ??? need to consider what happens if offset takes range out of bounds due to replacement
         struct once {
-            static let characterSet = NSCharacterSet(charactersInString: "\\$")
+            static let characterSet = NSCharacterSet(charactersIn: "\\$")
         }
         let template = templ._nsObject
         var range = template.rangeOfCharacter(from: once.characterSet)
diff --git a/Foundation/NSScanner.swift b/Foundation/NSScanner.swift
@@ -65,7 +65,7 @@ public class NSScanner : NSObject, NSCopying {
     public var caseSensitive: Bool = false
     public var locale: NSLocale?
     
-    internal static let defaultSkipSet = NSCharacterSet.whitespaceAndNewlineCharacterSet()
+    internal static let defaultSkipSet = NSCharacterSet.whitespacesAndNewlines()
     
     public init(string: String) {
         _scanString = string
@@ -206,7 +206,7 @@ internal struct _NSStringBuffer {
 
 private func isADigit(_ ch: unichar) -> Bool {
     struct Local {
-        static let set = NSCharacterSet.decimalDigitCharacterSet()
+        static let set = NSCharacterSet.decimalDigits()
     }
     return Local.set.characterIsMember(ch)
 }
diff --git a/Foundation/NSString.swift b/Foundation/NSString.swift
@@ -623,7 +623,7 @@ extension NSString {
     public var doubleValue: Double {
         var start: Int = 0
         var result = 0.0
-        _swiftObject.scan(NSCharacterSet.whitespaceCharacterSet(), locale: nil, locationToScanFrom: &start) { (value: Double) -> Void in
+        _swiftObject.scan(NSCharacterSet.whitespaces(), locale: nil, locationToScanFrom: &start) { (value: Double) -> Void in
             result = value
         }
         return result
@@ -632,7 +632,7 @@ extension NSString {
     public var floatValue: Float {
         var start: Int = 0
         var result: Float = 0.0
-        _swiftObject.scan(NSCharacterSet.whitespaceCharacterSet(), locale: nil, locationToScanFrom: &start) { (value: Float) -> Void in
+        _swiftObject.scan(NSCharacterSet.whitespaces(), locale: nil, locationToScanFrom: &start) { (value: Float) -> Void in
             result = value
         }
         return result
@@ -656,14 +656,14 @@ extension NSString {
     public var boolValue: Bool {
         let scanner = NSScanner(string: _swiftObject)
         // skip initial whitespace if present
-        scanner.scanCharactersFromSet(NSCharacterSet.whitespaceCharacterSet())
+        scanner.scanCharactersFromSet(NSCharacterSet.whitespaces())
         // scan a single optional '+' or '-' character, followed by zeroes
         if scanner.scanString(string: "+") == nil {
             scanner.scanString(string: "-")
         }
         // scan any following zeroes
-        scanner.scanCharactersFromSet(NSCharacterSet(charactersInString: "0"))
-        return scanner.scanCharactersFromSet(NSCharacterSet(charactersInString: "tTyY123456789")) != nil
+        scanner.scanCharactersFromSet(NSCharacterSet(charactersIn: "0"))
+        return scanner.scanCharactersFromSet(NSCharacterSet(charactersIn: "tTyY123456789")) != nil
     }
     
     public var uppercased: String {
diff --git a/Foundation/NSURLResponse.swift b/Foundation/NSURLResponse.swift
@@ -322,7 +322,7 @@ private extension String {
     var httpHeaderParts: ValueWithParameters? {
         var type: String?
         var parameters: [ValueWithParameters.Parameter] = []
-        let ws = NSCharacterSet.whitespaceCharacterSet()
+        let ws = NSCharacterSet.whitespaces()
         func append(_ string: String) {
             if type == nil {
                 type = string
diff --git a/TestFoundation/TestNSCharacterSet.swift b/TestFoundation/TestNSCharacterSet.swift
diff --git a/TestFoundation/TestNSString.swift b/TestFoundation/TestNSString.swift
diff --git a/TestFoundation/TestNSURLRequest.swift b/TestFoundation/TestNSURLRequest.swift

Original file line number	Diff line number	Diff line change
`@@ -65,63 +65,63 @@ public class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSCoding {`
`65`	`65`	`_CFDeinit(self)`
`66`	`66`	`}`
`67`	`67`
`68`		`- public class func controlCharacterSet() -> NSCharacterSet {`
	`68`	`+ public class func controlCharacters() -> NSCharacterSet {`
`69`	`69`	`return CFCharacterSetGetPredefined(kCFCharacterSetControl)._nsObject`
`70`	`70`	`}`
`71`	`71`
`72`		`- public class func whitespaceCharacterSet() -> NSCharacterSet {`
	`72`	`+ public class func whitespaces() -> NSCharacterSet {`
`73`	`73`	`return CFCharacterSetGetPredefined(kCFCharacterSetWhitespace)._nsObject`
`74`	`74`	`}`
`75`	`75`
`76`		`- public class func whitespaceAndNewlineCharacterSet() -> NSCharacterSet {`
	`76`	`+ public class func whitespacesAndNewlines() -> NSCharacterSet {`
`77`	`77`	`return CFCharacterSetGetPredefined(kCFCharacterSetWhitespaceAndNewline)._nsObject`
`78`	`78`	`}`
`79`	`79`
`80`		`- public class func decimalDigitCharacterSet() -> NSCharacterSet {`
	`80`	`+ public class func decimalDigits() -> NSCharacterSet {`
`81`	`81`	`return CFCharacterSetGetPredefined(kCFCharacterSetDecimalDigit)._nsObject`
`82`	`82`	`}`
`83`	`83`
`84`		`- public class func letterCharacterSet() -> NSCharacterSet {`
	`84`	`+ public class func letters() -> NSCharacterSet {`
`85`	`85`	`return CFCharacterSetGetPredefined(kCFCharacterSetLetter)._nsObject`
`86`	`86`	`}`
`87`	`87`
`88`		`- public class func lowercaseLetterCharacterSet() -> NSCharacterSet {`
	`88`	`+ public class func lowercaseLetters() -> NSCharacterSet {`
`89`	`89`	`return CFCharacterSetGetPredefined(kCFCharacterSetLowercaseLetter)._nsObject`
`90`	`90`	`}`
`91`	`91`
`92`		`- public class func uppercaseLetterCharacterSet() -> NSCharacterSet {`
	`92`	`+ public class func uppercaseLetters() -> NSCharacterSet {`
`93`	`93`	`return CFCharacterSetGetPredefined(kCFCharacterSetUppercaseLetter)._nsObject`
`94`	`94`	`}`
`95`	`95`
`96`		`- public class func nonBaseCharacterSet() -> NSCharacterSet {`
	`96`	`+ public class func nonBaseCharacters() -> NSCharacterSet {`
`97`	`97`	`return CFCharacterSetGetPredefined(kCFCharacterSetNonBase)._nsObject`
`98`	`98`	`}`
`99`	`99`
`100`		`- public class func alphanumericCharacterSet() -> NSCharacterSet {`
	`100`	`+ public class func alphanumerics() -> NSCharacterSet {`
`101`	`101`	`return CFCharacterSetGetPredefined(kCFCharacterSetAlphaNumeric)._nsObject`
`102`	`102`	`}`
`103`	`103`
`104`		`- public class func decomposableCharacterSet() -> NSCharacterSet {`
	`104`	`+ public class func decomposables() -> NSCharacterSet {`
`105`	`105`	`return CFCharacterSetGetPredefined(kCFCharacterSetDecomposable)._nsObject`
`106`	`106`	`}`
`107`	`107`
`108`		`- public class func illegalCharacterSet() -> NSCharacterSet {`
	`108`	`+ public class func illegalCharacters() -> NSCharacterSet {`
`109`	`109`	`return CFCharacterSetGetPredefined(kCFCharacterSetIllegal)._nsObject`
`110`	`110`	`}`
`111`	`111`
`112`		`- public class func punctuationCharacterSet() -> NSCharacterSet {`
	`112`	`+ public class func punctuation() -> NSCharacterSet {`
`113`	`113`	`return CFCharacterSetGetPredefined(kCFCharacterSetPunctuation)._nsObject`
`114`	`114`	`}`
`115`	`115`
`116`		`- public class func capitalizedLetterCharacterSet() -> NSCharacterSet {`
	`116`	`+ public class func capitalizedLetters() -> NSCharacterSet {`
`117`	`117`	`return CFCharacterSetGetPredefined(kCFCharacterSetCapitalizedLetter)._nsObject`
`118`	`118`	`}`
`119`	`119`
`120`		`- public class func symbolCharacterSet() -> NSCharacterSet {`
	`120`	`+ public class func symbols() -> NSCharacterSet {`
`121`	`121`	`return CFCharacterSetGetPredefined(kCFCharacterSetSymbol)._nsObject`
`122`	`122`	`}`
`123`	`123`
`124`		`- public class func newlineCharacterSet() -> NSCharacterSet {`
	`124`	`+ public class func newlines() -> NSCharacterSet {`
`125`	`125`	`return CFCharacterSetGetPredefined(kCFCharacterSetNewline)._nsObject`
`126`	`126`	`}`
`127`	`127`
`@@ -130,7 +130,7 @@ public class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSCoding {`
`130`	`130`	`_CFCharacterSetInitWithCharactersInRange(_cfMutableObject, CFRangeMake(aRange.location, aRange.length))`
`131`	`131`	`}`
`132`	`132`
`133`		`- public init(charactersInString aString: String) {`
	`133`	`+ public init(charactersIn aString: String) {`
`134`	`134`	`super.init()`
`135`	`135`	`_CFCharacterSetInitWithCharactersInString(_cfMutableObject, aString._cfObject)`
`136`	`136`	`}`
`@@ -149,7 +149,7 @@ public class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSCoding {`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`public convenience required init(coder aDecoder: NSCoder) {`
`152`		`- self.init(charactersInString: "")`
	`152`	`+ self.init(charactersIn: "")`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`public func characterIsMember(_ aCharacter: unichar) -> Bool {`
`@@ -203,92 +203,92 @@ public class NSMutableCharacterSet : NSCharacterSet {`
`203`	`203`	`NSUnimplemented()`
`204`	`204`	`}`
`205`	`205`
`206`		`- public func addCharactersInRange(_ aRange: NSRange) {`
	`206`	`+ public func addCharacters(in aRange: NSRange) {`
`207`	`207`	`CFCharacterSetAddCharactersInRange(_cfMutableObject , CFRangeMake(aRange.location, aRange.length))`
`208`	`208`	`}`
`209`	`209`
`210`		`- public func removeCharactersInRange(_ aRange: NSRange) {`
	`210`	`+ public func removeCharacters(in aRange: NSRange) {`
`211`	`211`	`CFCharacterSetRemoveCharactersInRange(_cfMutableObject , CFRangeMake(aRange.location, aRange.length))`
`212`	`212`	`}`
`213`	`213`
`214`		`- public func addCharactersInString(_ aString: String) {`
	`214`	`+ public func addCharacters(in aString: String) {`
`215`	`215`	`CFCharacterSetAddCharactersInString(_cfMutableObject, aString._cfObject)`
`216`	`216`	`}`
`217`	`217`
`218`		`- public func removeCharactersInString(_ aString: String) {`
	`218`	`+ public func removeCharacters(in aString: String) {`
`219`	`219`	`CFCharacterSetRemoveCharactersInString(_cfMutableObject, aString._cfObject)`
`220`	`220`	`}`
`221`	`221`
`222`		`- public func formUnionWithCharacterSet(_ otherSet: NSCharacterSet) {`
	`222`	`+ public func formUnion(with otherSet: NSCharacterSet) {`
`223`	`223`	`CFCharacterSetUnion(_cfMutableObject, otherSet._cfObject)`
`224`	`224`	`}`
`225`	`225`
`226`		`- public func formIntersectionWithCharacterSet(_ otherSet: NSCharacterSet) {`
	`226`	`+ public func formIntersection(with otherSet: NSCharacterSet) {`
`227`	`227`	`CFCharacterSetIntersect(_cfMutableObject, otherSet._cfObject)`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`public func invert() {`
`231`	`231`	`CFCharacterSetInvert(_cfMutableObject)`
`232`	`232`	`}`
`233`	`233`
`234`		`- public override class func controlCharacterSet() -> NSMutableCharacterSet {`
`235`		`- return NSCharacterSet.controlCharacterSet().mutableCopy() as! NSMutableCharacterSet`
	`234`	`+ public override class func controlCharacters() -> NSMutableCharacterSet {`
	`235`	`+ return NSCharacterSet.controlCharacters().mutableCopy() as! NSMutableCharacterSet`
`236`	`236`	`}`
`237`	`237`
`238`		`- public override class func whitespaceCharacterSet() -> NSMutableCharacterSet {`
`239`		`- return NSCharacterSet.whitespaceCharacterSet().mutableCopy() as! NSMutableCharacterSet`
	`238`	`+ public override class func whitespaces() -> NSMutableCharacterSet {`
	`239`	`+ return NSCharacterSet.whitespaces().mutableCopy() as! NSMutableCharacterSet`
`240`	`240`	`}`
`241`	`241`
`242`		`- public override class func whitespaceAndNewlineCharacterSet() -> NSMutableCharacterSet {`
`243`		`- return NSCharacterSet.whitespaceAndNewlineCharacterSet().mutableCopy() as! NSMutableCharacterSet`
	`242`	`+ public override class func whitespacesAndNewlines() -> NSMutableCharacterSet {`
	`243`	`+ return NSCharacterSet.whitespacesAndNewlines().mutableCopy() as! NSMutableCharacterSet`
`244`	`244`	`}`
`245`	`245`
`246`		`- public override class func decimalDigitCharacterSet() -> NSMutableCharacterSet {`
`247`		`- return NSCharacterSet.decimalDigitCharacterSet().mutableCopy() as! NSMutableCharacterSet`
	`246`	`+ public override class func decimalDigits() -> NSMutableCharacterSet {`
	`247`	`+ return NSCharacterSet.decimalDigits().mutableCopy() as! NSMutableCharacterSet`
`248`	`248`	`}`
`249`	`249`
`250`		`- public override class func letterCharacterSet() -> NSMutableCharacterSet {`
`251`		`- return NSCharacterSet.letterCharacterSet().mutableCopy() as! NSMutableCharacterSet`
	`250`	`+ public override class func letters() -> NSMutableCharacterSet {`
	`251`	`+ return NSCharacterSet.letters().mutableCopy() as! NSMutableCharacterSet`
`252`	`252`	`}`
`253`	`253`
`254`		`- public override class func lowercaseLetterCharacterSet() -> NSMutableCharacterSet {`
`255`		`- return NSCharacterSet.lowercaseLetterCharacterSet().mutableCopy() as! NSMutableCharacterSet`
	`254`	`+ public override class func lowercaseLetters() -> NSMutableCharacterSet {`
	`255`	`+ return NSCharacterSet.lowercaseLetters().mutableCopy() as! NSMutableCharacterSet`
`256`	`256`	`}`
`257`	`257`
`258`		`- public override class func uppercaseLetterCharacterSet() -> NSMutableCharacterSet {`
`259`		`- return NSCharacterSet.uppercaseLetterCharacterSet().mutableCopy() as! NSMutableCharacterSet`
	`258`	`+ public override class func uppercaseLetters() -> NSMutableCharacterSet {`
	`259`	`+ return NSCharacterSet.uppercaseLetters().mutableCopy() as! NSMutableCharacterSet`
`260`	`260`	`}`
`261`	`261`
`262`		`- public override class func nonBaseCharacterSet() -> NSMutableCharacterSet {`
`263`		`- return NSCharacterSet.nonBaseCharacterSet().mutableCopy() as! NSMutableCharacterSet`
	`262`	`+ public override class func nonBaseCharacters() -> NSMutableCharacterSet {`
	`263`	`+ return NSCharacterSet.nonBaseCharacters().mutableCopy() as! NSMutableCharacterSet`
`264`	`264`	`}`
`265`	`265`
`266`		`- public override class func alphanumericCharacterSet() -> NSMutableCharacterSet {`
`267`		`- return NSCharacterSet.alphanumericCharacterSet().mutableCopy() as! NSMutableCharacterSet`
	`266`	`+ public override class func alphanumerics() -> NSMutableCharacterSet {`
	`267`	`+ return NSCharacterSet.alphanumerics().mutableCopy() as! NSMutableCharacterSet`
`268`	`268`	`}`
`269`	`269`
`270`		`- public override class func decomposableCharacterSet() -> NSMutableCharacterSet {`
`271`		`- return NSCharacterSet.decomposableCharacterSet().mutableCopy() as! NSMutableCharacterSet`
	`270`	`+ public override class func decomposables() -> NSMutableCharacterSet {`
	`271`	`+ return NSCharacterSet.decomposables().mutableCopy() as! NSMutableCharacterSet`
`272`	`272`	`}`
`273`	`273`
`274`		`- public override class func illegalCharacterSet() -> NSMutableCharacterSet {`
`275`		`- return NSCharacterSet.illegalCharacterSet().mutableCopy() as! NSMutableCharacterSet`
	`274`	`+ public override class func illegalCharacters() -> NSMutableCharacterSet {`
	`275`	`+ return NSCharacterSet.illegalCharacters().mutableCopy() as! NSMutableCharacterSet`
`276`	`276`	`}`
`277`	`277`
`278`		`- public override class func punctuationCharacterSet() -> NSMutableCharacterSet {`
`279`		`- return NSCharacterSet.punctuationCharacterSet().mutableCopy() as! NSMutableCharacterSet`
	`278`	`+ public override class func punctuation() -> NSMutableCharacterSet {`
	`279`	`+ return NSCharacterSet.punctuation().mutableCopy() as! NSMutableCharacterSet`
`280`	`280`	`}`
`281`	`281`
`282`		`- public override class func capitalizedLetterCharacterSet() -> NSMutableCharacterSet {`
`283`		`- return NSCharacterSet.capitalizedLetterCharacterSet().mutableCopy() as! NSMutableCharacterSet`
	`282`	`+ public override class func capitalizedLetters() -> NSMutableCharacterSet {`
	`283`	`+ return NSCharacterSet.capitalizedLetters().mutableCopy() as! NSMutableCharacterSet`
`284`	`284`	`}`
`285`	`285`
`286`		`- public override class func symbolCharacterSet() -> NSMutableCharacterSet {`
`287`		`- return NSCharacterSet.symbolCharacterSet().mutableCopy() as! NSMutableCharacterSet`
	`286`	`+ public override class func symbols() -> NSMutableCharacterSet {`
	`287`	`+ return NSCharacterSet.symbols().mutableCopy() as! NSMutableCharacterSet`
`288`	`288`	`}`
`289`	`289`
`290`		`- public override class func newlineCharacterSet() -> NSMutableCharacterSet {`
`291`		`- return NSCharacterSet.newlineCharacterSet().mutableCopy() as! NSMutableCharacterSet`
	`290`	`+ public override class func newlines() -> NSMutableCharacterSet {`
	`291`	`+ return NSCharacterSet.newlines().mutableCopy() as! NSMutableCharacterSet`
`292`	`292`	`}`
`293`	`293`	`}`
`294`	`294`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ public func NSRangeFromString(_ aString: String) -> NSRange {`
`181`	`181`	`return emptyRange`
`182`	`182`	`}`
`183`	`183`	`let scanner = NSScanner(string: aString)`
`184`		`- let digitSet = NSCharacterSet.decimalDigitCharacterSet()`
	`184`	`+ let digitSet = NSCharacterSet.decimalDigits()`
`185`	`185`	`scanner.scanUpToCharactersFromSet(digitSet)`
`186`	`186`	`if scanner.atEnd {`
`187`	`187`	`// fail early if there are no decimal digits`
Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ extension NSRegularExpression {`
`259`	`259`	`public func replacementString(for result: NSTextCheckingResult, in string: String, offset: Int, template templ: String) -> String {`
`260`	`260`	`// ??? need to consider what happens if offset takes range out of bounds due to replacement`
`261`	`261`	`struct once {`
`262`		`- static let characterSet = NSCharacterSet(charactersInString: "\\$")`
	`262`	`+ static let characterSet = NSCharacterSet(charactersIn: "\\$")`
`263`	`263`	`}`
`264`	`264`	`let template = templ._nsObject`
`265`	`265`	`var range = template.rangeOfCharacter(from: once.characterSet)`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public class NSScanner : NSObject, NSCopying {`
`65`	`65`	`public var caseSensitive: Bool = false`
`66`	`66`	`public var locale: NSLocale?`
`67`	`67`
`68`		`- internal static let defaultSkipSet = NSCharacterSet.whitespaceAndNewlineCharacterSet()`
	`68`	`+ internal static let defaultSkipSet = NSCharacterSet.whitespacesAndNewlines()`
`69`	`69`
`70`	`70`	`public init(string: String) {`
`71`	`71`	`_scanString = string`
`@@ -206,7 +206,7 @@ internal struct _NSStringBuffer {`
`206`	`206`
`207`	`207`	`private func isADigit(_ ch: unichar) -> Bool {`
`208`	`208`	`struct Local {`
`209`		`- static let set = NSCharacterSet.decimalDigitCharacterSet()`
	`209`	`+ static let set = NSCharacterSet.decimalDigits()`
`210`	`210`	`}`
`211`	`211`	`return Local.set.characterIsMember(ch)`
`212`	`212`	`}`