Remove deprecated (Sub)String .characters and CharacterView

spevans · spevans · commit 57147be458f5 · 2017-08-12T16:54:55.000+01:00
diff --git a/Foundation/HTTPCookie.swift b/Foundation/HTTPCookie.swift
@@ -249,7 +249,7 @@ open class HTTPCookie : NSObject {
         _domain = canonicalDomain
 
         if let
-            secureString = properties[.secure] as? String, !secureString.characters.isEmpty
+            secureString = properties[.secure] as? String, !secureString.isEmpty
         {
             _secure = true
         } else {
@@ -267,8 +267,7 @@ open class HTTPCookie : NSObject {
         _version = version
 
         if let portString = properties[.port] as? String, _version == 1 {
-            _portList = portString.characters
-                .split(separator: ",")
+            _portList = portString.split(separator: ",")
                 .flatMap { Int(String($0)) }
                 .map { NSNumber(value: $0) }
         } else {
@@ -361,8 +360,8 @@ open class HTTPCookie : NSObject {
         }
         //Remove the final trailing semicolon and whitespace
         if ( cookieString.length > 0 ) {
-            cookieString.characters.removeLast()
-            cookieString.characters.removeLast()
+            cookieString.removeLast()
+            cookieString.removeLast()
         }
         return ["Cookie": cookieString]
     }
@@ -624,7 +623,7 @@ fileprivate extension String {
     }
 
     func insertComma(at index:Int) -> String {
-        return  String(self.characters.prefix(index)) + ","  + String(self.characters.suffix(self.characters.count-index))
+        return  String(self.prefix(index)) + ","  + String(self.suffix(self.count-index))
     }
 }
 
diff --git a/Foundation/JSONSerialization.swift b/Foundation/JSONSerialization.swift
@@ -286,8 +286,8 @@ internal extension JSONSerialization {
 //MARK: - JSONSerializer
 private struct JSONWriter {
     
-    private let maxUIntLength = String(describing: UInt.max).characters.count
-    private let maxIntLength = String(describing: Int.max).characters.count
+    private let maxUIntLength = String(describing: UInt.max).count
+    private let maxIntLength = String(describing: Int.max).count
     var indent = 0
     let pretty: Bool
     let sortedKeys: Bool
diff --git a/Foundation/NSPathUtilities.swift b/Foundation/NSPathUtilities.swift
@@ -35,18 +35,16 @@ public func NSTemporaryDirectory() -> String {
 
 internal extension String {
     
-    internal var _startOfLastPathComponent : String.CharacterView.Index {
+    internal var _startOfLastPathComponent : String.Index {
         precondition(!hasSuffix("/") && length > 1)
         
-        let characterView = characters
-        let startPos = characterView.startIndex
-        let endPos = characterView.endIndex
-        var curPos = endPos
+        let startPos = startIndex
+        var curPos = endIndex
         
         // Find the beginning of the component
         while curPos > startPos {
-            let prevPos = characterView.index(before: curPos)
-            if characterView[prevPos] == "/" {
+            let prevPos = index(before: curPos)
+            if self[prevPos] == "/" {
                 break
             }
             curPos = prevPos
@@ -55,19 +53,16 @@ internal extension String {
 
     }
 
-    internal var _startOfPathExtension : String.CharacterView.Index? {
+    internal var _startOfPathExtension : String.Index? {
         precondition(!hasSuffix("/"))
         
-        let characterView = self.characters
-        let endPos = characterView.endIndex
-        var curPos = endPos
-        
+        var curPos = endIndex
         let lastCompStartPos = _startOfLastPathComponent
         
         // Find the beginning of the extension
         while curPos > lastCompStartPos {
-            let prevPos = characterView.index(before: curPos)
-            let char = characterView[prevPos]
+            let prevPos = index(before: curPos)
+            let char = self[prevPos]
             if char == "/" {
                 return nil
             } else if char == "." {
@@ -125,7 +120,7 @@ internal extension String {
             }
         }
         if stripTrailing && result.length > 1 && result.hasSuffix("/") {
-            result.remove(at: result.characters.index(before: result.characters.endIndex))
+            result.remove(at: result.index(before: result.endIndex))
         }
         return result
     }
@@ -181,7 +176,7 @@ public extension NSString {
             return fixedSelf
         }
         
-        return String(fixedSelf.characters.suffix(from: fixedSelf._startOfLastPathComponent))
+        return String(fixedSelf.suffix(from: fixedSelf._startOfLastPathComponent))
     }
     
     public var deletingLastPathComponent : String {
@@ -202,7 +197,7 @@ public extension NSString {
         
         // all common cases
         case let startOfLast:
-            return String(fixedSelf.characters.prefix(upTo: fixedSelf.index(before: startOfLast)))
+            return String(fixedSelf.prefix(upTo: fixedSelf.index(before: startOfLast)))
         }
     }
     
@@ -236,7 +231,7 @@ public extension NSString {
             }
         }
         if stripTrailing && result.hasSuffix("/") {
-            result.remove(at: result.characters.index(before: result.characters.endIndex))
+            result.remove(at: result.index(before: result.endIndex))
         }
         return result
     }
@@ -265,7 +260,7 @@ public extension NSString {
         }
 
         if let extensionPos = fixedSelf._startOfPathExtension {
-            return String(fixedSelf.characters.suffix(from: extensionPos))
+            return String(fixedSelf.suffix(from: extensionPos))
         } else {
             return ""
         }
@@ -277,7 +272,7 @@ public extension NSString {
             return fixedSelf
         }
         if let extensionPos = (fixedSelf._startOfPathExtension) {
-            return String(fixedSelf.characters.prefix(upTo: fixedSelf.characters.index(before: extensionPos)))
+            return String(fixedSelf.prefix(upTo: fixedSelf.index(before: extensionPos)))
         } else {
             return fixedSelf
         }
@@ -297,9 +292,9 @@ public extension NSString {
             return _swiftObject
         }
 
-        let endOfUserName = _swiftObject.characters.index(of: "/") ?? _swiftObject.endIndex
-        let startOfUserName = _swiftObject.characters.index(after: _swiftObject.characters.startIndex)
-        let userName = String(_swiftObject.characters[startOfUserName..<endOfUserName])
+        let endOfUserName = _swiftObject.index(of: "/") ?? _swiftObject.endIndex
+        let startOfUserName = _swiftObject.index(after: _swiftObject.startIndex)
+        let userName = String(_swiftObject[startOfUserName..<endOfUserName])
         let optUserName: String? = userName.isEmpty ? nil : userName
         
         guard let homeDir = NSHomeDirectoryForUser(optUserName) else {
@@ -478,7 +473,7 @@ public extension NSString {
             return strings.first
         }
         
-        var sequences = strings.map({ $0.characters.makeIterator() })
+        var sequences = strings.map({ $0.makeIterator() })
         var prefix: [Character] = []
         loop: while true {
             var char: Character? = nil
@@ -490,8 +485,8 @@ public extension NSString {
                 }
                 
                 if char != nil {
-                    let lhs = caseSensitive ? char : String(char!).lowercased().characters.first!
-                    let rhs = caseSensitive ? c : String(c).lowercased().characters.first!
+                    let lhs = caseSensitive ? char : String(char!).lowercased().first!
+                    let rhs = caseSensitive ? c : String(c).lowercased().first!
                     if lhs != rhs {
                         break loop
                     }
diff --git a/Foundation/NSStringAPI.swift b/Foundation/NSStringAPI.swift
@@ -292,7 +292,7 @@ extension String {
       aString,
       options: mask,
       range: _toNSRange(
-        range ?? self.characters.startIndex..<self.characters.endIndex
+        range ?? self.startIndex..<self.endIndex
       ),
       locale: locale?._bridgeToObjectiveC()
     )
@@ -1060,7 +1060,7 @@ extension String {
         from: aSet,
         options: mask,
         range: _toNSRange(
-          aRange ?? self.characters.startIndex..<self.characters.endIndex
+          aRange ?? self.startIndex..<self.endIndex
         )
       )
     )
@@ -1120,7 +1120,7 @@ extension String {
         of: aString,
         options: mask,
         range: _toNSRange(
-          searchRange ?? self.characters.startIndex..<self.characters.endIndex
+          searchRange ?? self.startIndex..<self.endIndex
         ),
         locale: locale
       )
@@ -1343,7 +1343,7 @@ extension String {
       with: replacement,
       options: options,
       range: _toNSRange(
-        searchRange ?? self.characters.startIndex..<self.characters.endIndex
+        searchRange ?? self.startIndex..<self.endIndex
       )
     )
     : _ns.replacingOccurrences(of: target, with: replacement)
diff --git a/Foundation/NSURL.swift b/Foundation/NSURL.swift
@@ -34,7 +34,7 @@ internal func _pathComponents(_ path: String?) -> [String]? {
         if p.length == 0 {
             return result
         } else {
-            let characterView = p.characters
+            let characterView = p
             var curPos = characterView.startIndex
             let endPos = characterView.endIndex
             if characterView[curPos] == "/" {
@@ -738,7 +738,7 @@ extension NSURL {
                 }
             }
             if stripTrailing && result.hasSuffix("/") {
-                result.remove(at: result.characters.index(before: result.characters.endIndex))
+                result.remove(at: result.index(before: result.endIndex))
             }
             return result
         }
@@ -757,7 +757,7 @@ extension NSURL {
             return fixedSelf
         }
         
-        return String(fixedSelf.characters.suffix(from: fixedSelf._startOfLastPathComponent))
+        return String(fixedSelf.suffix(from: fixedSelf._startOfLastPathComponent))
     }
     
     open var pathExtension: String? {
@@ -769,7 +769,7 @@ extension NSURL {
         }
         
         if let extensionPos = fixedSelf._startOfPathExtension {
-            return String(fixedSelf.characters.suffix(from: extensionPos))
+            return String(fixedSelf.suffix(from: extensionPos))
         } else {
             return ""
         }
diff --git a/Foundation/ProcessInfo.swift b/Foundation/ProcessInfo.swift
@@ -92,7 +92,7 @@ open class ProcessInfo: NSObject {
             return OperatingSystemVersion(majorVersion: fallbackMajor, minorVersion: fallbackMinor, patchVersion: fallbackPatch)
         }
         
-        let versionComponents = productVersion._swiftObject.characters.split(separator: ".").map(String.init).flatMap({ Int($0) })
+        let versionComponents = productVersion._swiftObject.split(separator: ".").map(String.init).flatMap({ Int($0) })
         let majorVersion = versionComponents.dropFirst(0).first ?? fallbackMajor
         let minorVersion = versionComponents.dropFirst(1).first ?? fallbackMinor
         let patchVersion = versionComponents.dropFirst(2).first ?? fallbackPatch
diff --git a/Foundation/XMLNode.swift b/Foundation/XMLNode.swift
@@ -421,7 +421,7 @@ open class XMLNode: NSObject, NSCopying {
         var entityChars: [Character] = []
         var inEntity = false
         var startIndex = 0
-        for (index, char) in string.characters.enumerated() {
+        for (index, char) in string.enumerated() {
             if char == "&" {
                 inEntity = true
                 startIndex = index
@@ -440,7 +440,7 @@ open class XMLNode: NSObject, NSCopying {
             }
         }
 
-        var result: [Character] = Array(string.characters)
+        var result: [Character] = Array(string)
         let doc = _CFXMLNodeGetDocument(_xmlNode)!
         for (range, entity) in entities {
             var entityPtr = _CFXMLGetDocEntity(doc, entity)
@@ -452,7 +452,7 @@ open class XMLNode: NSObject, NSCopying {
             }
             if let validEntity = entityPtr {
                 let replacement = _CFXMLCopyEntityContent(validEntity)?._swiftObject ?? ""
-                result.replaceSubrange(range, with: replacement.characters)
+                result.replaceSubrange(range, with: replacement)
             } else {
                 result.replaceSubrange(range, with: []) // This appears to be how Darwin Foundation does it
             }

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ open class HTTPCookie : NSObject {`
`249`	`249`	`_domain = canonicalDomain`
`250`	`250`
`251`	`251`	`if let`
`252`		`- secureString = properties[.secure] as? String, !secureString.characters.isEmpty`
	`252`	`+ secureString = properties[.secure] as? String, !secureString.isEmpty`
`253`	`253`	`{`
`254`	`254`	`_secure = true`
`255`	`255`	`} else {`
`@@ -267,8 +267,7 @@ open class HTTPCookie : NSObject {`
`267`	`267`	`_version = version`
`268`	`268`
`269`	`269`	`if let portString = properties[.port] as? String, _version == 1 {`
`270`		`- _portList = portString.characters`
`271`		`- .split(separator: ",")`
	`270`	`+ _portList = portString.split(separator: ",")`
`272`	`271`	`.flatMap { Int(String($0)) }`
`273`	`272`	`.map { NSNumber(value: $0) }`
`274`	`273`	`} else {`
`@@ -361,8 +360,8 @@ open class HTTPCookie : NSObject {`
`361`	`360`	`}`
`362`	`361`	`//Remove the final trailing semicolon and whitespace`
`363`	`362`	`if ( cookieString.length > 0 ) {`
`364`		`- cookieString.characters.removeLast()`
`365`		`- cookieString.characters.removeLast()`
	`363`	`+ cookieString.removeLast()`
	`364`	`+ cookieString.removeLast()`
`366`	`365`	`}`
`367`	`366`	`return ["Cookie": cookieString]`
`368`	`367`	`}`
`@@ -624,7 +623,7 @@ fileprivate extension String {`
`624`	`623`	`}`
`625`	`624`
`626`	`625`	`func insertComma(at index:Int) -> String {`
`627`		`- return String(self.characters.prefix(index)) + "," + String(self.characters.suffix(self.characters.count-index))`
	`626`	`+ return String(self.prefix(index)) + "," + String(self.suffix(self.count-index))`
`628`	`627`	`}`
`629`	`628`	`}`
`630`	`629`
Original file line number	Diff line number	Diff line change
`@@ -35,18 +35,16 @@ public func NSTemporaryDirectory() -> String {`
`35`	`35`
`36`	`36`	`internal extension String {`
`37`	`37`
`38`		`- internal var _startOfLastPathComponent : String.CharacterView.Index {`
	`38`	`+ internal var _startOfLastPathComponent : String.Index {`
`39`	`39`	`precondition(!hasSuffix("/") && length > 1)`
`40`	`40`
`41`		`- let characterView = characters`
`42`		`- let startPos = characterView.startIndex`
`43`		`- let endPos = characterView.endIndex`
`44`		`- var curPos = endPos`
	`41`	`+ let startPos = startIndex`
	`42`	`+ var curPos = endIndex`
`45`	`43`
`46`	`44`	`// Find the beginning of the component`
`47`	`45`	`while curPos > startPos {`
`48`		`- let prevPos = characterView.index(before: curPos)`
`49`		`- if characterView[prevPos] == "/" {`
	`46`	`+ let prevPos = index(before: curPos)`
	`47`	`+ if self[prevPos] == "/" {`
`50`	`48`	`break`
`51`	`49`	`}`
`52`	`50`	`curPos = prevPos`
`@@ -55,19 +53,16 @@ internal extension String {`
`55`	`53`
`56`	`54`	`}`
`57`	`55`
`58`		`- internal var _startOfPathExtension : String.CharacterView.Index? {`
	`56`	`+ internal var _startOfPathExtension : String.Index? {`
`59`	`57`	`precondition(!hasSuffix("/"))`
`60`	`58`
`61`		`- let characterView = self.characters`
`62`		`- let endPos = characterView.endIndex`
`63`		`- var curPos = endPos`
`64`		`-`
	`59`	`+ var curPos = endIndex`
`65`	`60`	`let lastCompStartPos = _startOfLastPathComponent`
`66`	`61`
`67`	`62`	`// Find the beginning of the extension`
`68`	`63`	`while curPos > lastCompStartPos {`
`69`		`- let prevPos = characterView.index(before: curPos)`
`70`		`- let char = characterView[prevPos]`
	`64`	`+ let prevPos = index(before: curPos)`
	`65`	`+ let char = self[prevPos]`
`71`	`66`	`if char == "/" {`
`72`	`67`	`return nil`
`73`	`68`	`} else if char == "." {`
`@@ -125,7 +120,7 @@ internal extension String {`
`125`	`120`	`}`
`126`	`121`	`}`
`127`	`122`	`if stripTrailing && result.length > 1 && result.hasSuffix("/") {`
`128`		`- result.remove(at: result.characters.index(before: result.characters.endIndex))`
	`123`	`+ result.remove(at: result.index(before: result.endIndex))`
`129`	`124`	`}`
`130`	`125`	`return result`
`131`	`126`	`}`
`@@ -181,7 +176,7 @@ public extension NSString {`
`181`	`176`	`return fixedSelf`
`182`	`177`	`}`
`183`	`178`
`184`		`- return String(fixedSelf.characters.suffix(from: fixedSelf._startOfLastPathComponent))`
	`179`	`+ return String(fixedSelf.suffix(from: fixedSelf._startOfLastPathComponent))`
`185`	`180`	`}`
`186`	`181`
`187`	`182`	`public var deletingLastPathComponent : String {`
`@@ -202,7 +197,7 @@ public extension NSString {`
`202`	`197`
`203`	`198`	`// all common cases`
`204`	`199`	`case let startOfLast:`
`205`		`- return String(fixedSelf.characters.prefix(upTo: fixedSelf.index(before: startOfLast)))`
	`200`	`+ return String(fixedSelf.prefix(upTo: fixedSelf.index(before: startOfLast)))`
`206`	`201`	`}`
`207`	`202`	`}`
`208`	`203`
`@@ -236,7 +231,7 @@ public extension NSString {`
`236`	`231`	`}`
`237`	`232`	`}`
`238`	`233`	`if stripTrailing && result.hasSuffix("/") {`
`239`		`- result.remove(at: result.characters.index(before: result.characters.endIndex))`
	`234`	`+ result.remove(at: result.index(before: result.endIndex))`
`240`	`235`	`}`
`241`	`236`	`return result`
`242`	`237`	`}`
`@@ -265,7 +260,7 @@ public extension NSString {`
`265`	`260`	`}`
`266`	`261`
`267`	`262`	`if let extensionPos = fixedSelf._startOfPathExtension {`
`268`		`- return String(fixedSelf.characters.suffix(from: extensionPos))`
	`263`	`+ return String(fixedSelf.suffix(from: extensionPos))`
`269`	`264`	`} else {`
`270`	`265`	`return ""`
`271`	`266`	`}`
`@@ -277,7 +272,7 @@ public extension NSString {`
`277`	`272`	`return fixedSelf`
`278`	`273`	`}`
`279`	`274`	`if let extensionPos = (fixedSelf._startOfPathExtension) {`
`280`		`- return String(fixedSelf.characters.prefix(upTo: fixedSelf.characters.index(before: extensionPos)))`
	`275`	`+ return String(fixedSelf.prefix(upTo: fixedSelf.index(before: extensionPos)))`
`281`	`276`	`} else {`
`282`	`277`	`return fixedSelf`
`283`	`278`	`}`
`@@ -297,9 +292,9 @@ public extension NSString {`
`297`	`292`	`return _swiftObject`
`298`	`293`	`}`
`299`	`294`
`300`		`- let endOfUserName = _swiftObject.characters.index(of: "/") ?? _swiftObject.endIndex`
`301`		`- let startOfUserName = _swiftObject.characters.index(after: _swiftObject.characters.startIndex)`
`302`		`- let userName = String(_swiftObject.characters[startOfUserName..<endOfUserName])`
	`295`	`+ let endOfUserName = _swiftObject.index(of: "/") ?? _swiftObject.endIndex`
	`296`	`+ let startOfUserName = _swiftObject.index(after: _swiftObject.startIndex)`
	`297`	`+ let userName = String(_swiftObject[startOfUserName..<endOfUserName])`
`303`	`298`	`let optUserName: String? = userName.isEmpty ? nil : userName`
`304`	`299`
`305`	`300`	`guard let homeDir = NSHomeDirectoryForUser(optUserName) else {`
`@@ -478,7 +473,7 @@ public extension NSString {`
`478`	`473`	`return strings.first`
`479`	`474`	`}`
`480`	`475`
`481`		`- var sequences = strings.map({ $0.characters.makeIterator() })`
	`476`	`+ var sequences = strings.map({ $0.makeIterator() })`
`482`	`477`	`var prefix: [Character] = []`
`483`	`478`	`loop: while true {`
`484`	`479`	`var char: Character? = nil`
`@@ -490,8 +485,8 @@ public extension NSString {`
`490`	`485`	`}`
`491`	`486`
`492`	`487`	`if char != nil {`
`493`		`- let lhs = caseSensitive ? char : String(char!).lowercased().characters.first!`
`494`		`- let rhs = caseSensitive ? c : String(c).lowercased().characters.first!`
	`488`	`+ let lhs = caseSensitive ? char : String(char!).lowercased().first!`
	`489`	`+ let rhs = caseSensitive ? c : String(c).lowercased().first!`
`495`	`490`	`if lhs != rhs {`
`496`	`491`	`break loop`
`497`	`492`	`}`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ extension String {`
`292`	`292`	`aString,`
`293`	`293`	`options: mask,`
`294`	`294`	`range: _toNSRange(`
`295`		`- range ?? self.characters.startIndex..<self.characters.endIndex`
	`295`	`+ range ?? self.startIndex..<self.endIndex`
`296`	`296`	`),`
`297`	`297`	`locale: locale?._bridgeToObjectiveC()`
`298`	`298`	`)`
`@@ -1060,7 +1060,7 @@ extension String {`
`1060`	`1060`	`from: aSet,`
`1061`	`1061`	`options: mask,`
`1062`	`1062`	`range: _toNSRange(`
`1063`		`- aRange ?? self.characters.startIndex..<self.characters.endIndex`
	`1063`	`+ aRange ?? self.startIndex..<self.endIndex`
`1064`	`1064`	`)`
`1065`	`1065`	`)`
`1066`	`1066`	`)`
`@@ -1120,7 +1120,7 @@ extension String {`
`1120`	`1120`	`of: aString,`
`1121`	`1121`	`options: mask,`
`1122`	`1122`	`range: _toNSRange(`
`1123`		`- searchRange ?? self.characters.startIndex..<self.characters.endIndex`
	`1123`	`+ searchRange ?? self.startIndex..<self.endIndex`
`1124`	`1124`	`),`
`1125`	`1125`	`locale: locale`
`1126`	`1126`	`)`
`@@ -1343,7 +1343,7 @@ extension String {`
`1343`	`1343`	`with: replacement,`
`1344`	`1344`	`options: options,`
`1345`	`1345`	`range: _toNSRange(`
`1346`		`- searchRange ?? self.characters.startIndex..<self.characters.endIndex`
	`1346`	`+ searchRange ?? self.startIndex..<self.endIndex`
`1347`	`1347`	`)`
`1348`	`1348`	`)`
`1349`	`1349`	`: _ns.replacingOccurrences(of: target, with: replacement)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ internal func _pathComponents(_ path: String?) -> [String]? {`
`34`	`34`	`if p.length == 0 {`
`35`	`35`	`return result`
`36`	`36`	`} else {`
`37`		`- let characterView = p.characters`
	`37`	`+ let characterView = p`
`38`	`38`	`var curPos = characterView.startIndex`
`39`	`39`	`let endPos = characterView.endIndex`
`40`	`40`	`if characterView[curPos] == "/" {`
`@@ -738,7 +738,7 @@ extension NSURL {`
`738`	`738`	`}`
`739`	`739`	`}`
`740`	`740`	`if stripTrailing && result.hasSuffix("/") {`
`741`		`- result.remove(at: result.characters.index(before: result.characters.endIndex))`
	`741`	`+ result.remove(at: result.index(before: result.endIndex))`
`742`	`742`	`}`
`743`	`743`	`return result`
`744`	`744`	`}`
`@@ -757,7 +757,7 @@ extension NSURL {`
`757`	`757`	`return fixedSelf`
`758`	`758`	`}`
`759`	`759`
`760`		`- return String(fixedSelf.characters.suffix(from: fixedSelf._startOfLastPathComponent))`
	`760`	`+ return String(fixedSelf.suffix(from: fixedSelf._startOfLastPathComponent))`
`761`	`761`	`}`
`762`	`762`
`763`	`763`	`open var pathExtension: String? {`
`@@ -769,7 +769,7 @@ extension NSURL {`
`769`	`769`	`}`
`770`	`770`
`771`	`771`	`if let extensionPos = fixedSelf._startOfPathExtension {`
`772`		`- return String(fixedSelf.characters.suffix(from: extensionPos))`
	`772`	`+ return String(fixedSelf.suffix(from: extensionPos))`
`773`	`773`	`} else {`
`774`	`774`	`return ""`
`775`	`775`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ open class ProcessInfo: NSObject {`
`92`	`92`	`return OperatingSystemVersion(majorVersion: fallbackMajor, minorVersion: fallbackMinor, patchVersion: fallbackPatch)`
`93`	`93`	`}`
`94`	`94`
`95`		`- let versionComponents = productVersion._swiftObject.characters.split(separator: ".").map(String.init).flatMap({ Int($0) })`
	`95`	`+ let versionComponents = productVersion._swiftObject.split(separator: ".").map(String.init).flatMap({ Int($0) })`
`96`	`96`	`let majorVersion = versionComponents.dropFirst(0).first ?? fallbackMajor`
`97`	`97`	`let minorVersion = versionComponents.dropFirst(1).first ?? fallbackMinor`
`98`	`98`	`let patchVersion = versionComponents.dropFirst(2).first ?? fallbackPatch`
Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ open class XMLNode: NSObject, NSCopying {`
`421`	`421`	`var entityChars: [Character] = []`
`422`	`422`	`var inEntity = false`
`423`	`423`	`var startIndex = 0`
`424`		`- for (index, char) in string.characters.enumerated() {`
	`424`	`+ for (index, char) in string.enumerated() {`
`425`	`425`	`if char == "&" {`
`426`	`426`	`inEntity = true`
`427`	`427`	`startIndex = index`
`@@ -440,7 +440,7 @@ open class XMLNode: NSObject, NSCopying {`
`440`	`440`	`}`
`441`	`441`	`}`
`442`	`442`
`443`		`- var result: [Character] = Array(string.characters)`
	`443`	`+ var result: [Character] = Array(string)`
`444`	`444`	`let doc = _CFXMLNodeGetDocument(_xmlNode)!`
`445`	`445`	`for (range, entity) in entities {`
`446`	`446`	`var entityPtr = _CFXMLGetDocEntity(doc, entity)`
`@@ -452,7 +452,7 @@ open class XMLNode: NSObject, NSCopying {`
`452`	`452`	`}`
`453`	`453`	`if let validEntity = entityPtr {`
`454`	`454`	`let replacement = _CFXMLCopyEntityContent(validEntity)?._swiftObject ?? ""`
`455`		`- result.replaceSubrange(range, with: replacement.characters)`
	`455`	`+ result.replaceSubrange(range, with: replacement)`
`456`	`456`	`} else {`
`457`	`457`	`result.replaceSubrange(range, with: []) // This appears to be how Darwin Foundation does it`
`458`	`458`	`}`