Minor update for SE-0089

Author: CodaFi

Foundation/NSBundle.swift

@@ -63,7 +63,7 @@ public class Bundle: NSObject {
     }
 
     override public var description: String {
-        return "\(String(Bundle.self)) <\(bundleURL.path!)> (\(isLoaded  ? "loaded" : "not yet loaded"))"
+        return "\(String(describing: Bundle.self)) <\(bundleURL.path!)> (\(isLoaded  ? "loaded" : "not yet loaded"))"
     }
 
 

Foundation/NSHost.swift

@@ -94,7 +94,7 @@ public class Host: NSObject {
                 let lookupInfo = { (content: inout [String], flags: Int32) in
                     let hname = UnsafeMutablePointer<Int8>.allocate(capacity: 1024)
                     if (getnameinfo(info.ai_addr, sa_len, hname, 1024, nil, 0, flags) == 0) {
-                        content.append(String(hname))
+                        content.append(String(describing: hname))
                     }
                     hname.deinitialize()
                     hname.deallocate(capacity: 1024)

Foundation/NSJSONSerialization.swift

@@ -599,7 +599,7 @@ private struct JSONReader {
         }
 
         if !UTF16.isLeadSurrogate(codeUnit) {
-            return (String(UnicodeScalar(codeUnit)), index)
+            return (String(UnicodeScalar(codeUnit)!), index)
         }
 
         guard let (trailCodeUnit, finalIndex) = try consumeASCIISequence("\\u", input: index).flatMap(parseCodeUnit) , UTF16.isTrailSurrogate(trailCodeUnit) else {
@@ -610,7 +610,7 @@ private struct JSONReader {
 
         let highValue = (UInt32(codeUnit  - 0xD800) << 10)
         let lowValue  =  UInt32(trailCodeUnit - 0xDC00)
-        return (String(UnicodeScalar(highValue + lowValue + 0x10000)), finalIndex)
+        return (String(UnicodeScalar(highValue + lowValue + 0x10000)!), finalIndex)
     }
 
     func isHexChr(_ byte: UInt8) -> Bool {

Foundation/NSKeyedArchiver.swift

@@ -238,14 +238,14 @@ public class NSKeyedArchiver : NSCoder {
     }
 
     public class func setClassName(_ codedName: String?, for cls: AnyClass) {
-        let clsName = String(cls.dynamicType)
+        let clsName = String(describing: cls.dynamicType)
         _classNameMapLock.synchronized {
             _classNameMap[clsName] = codedName
         }
     }
 
     public func setClassName(_ codedName: String?, for cls: AnyClass) {
-        let clsName = String(cls.dynamicType)
+        let clsName = String(describing: cls.dynamicType)
         _classNameMap[clsName] = codedName
     }
 

Foundation/NSObjCRuntime.swift

@@ -258,7 +258,7 @@ public func NSStringFromClass(_ aClass: AnyClass) -> String {
     if components[0] == _SwiftFoundationModuleName {
         return components[1]
     } else {
-        return String(aClassName)
+        return String(describing: aClassName)
     }
 }
 

Foundation/NSRegularExpression.swift

@@ -225,7 +225,7 @@ extension RegularExpression {
             if currentRange.location > NSMaxRange(previousRange) {
                 let min = start.advanced(by: NSMaxRange(previousRange))
                 let max = start.advanced(by: currentRange.location)
-                str += String(string.utf16[min..<max])
+                str += String(string.utf16[min..<max])!
             }
             str += replacement
             previousRange = currentRange
@@ -234,7 +234,7 @@ extension RegularExpression {
         if length > NSMaxRange(previousRange) {
             let min = start.advanced(by: NSMaxRange(previousRange))
             let max = start.advanced(by: length)
-            str += String(string.utf16[min..<max])
+            str += String(string.utf16[min..<max])!
         }
 
         return str
@@ -311,7 +311,7 @@ extension RegularExpression {
                             let start = string.utf16.startIndex
                             let min = start.advanced(by: substringRange.location)
                             let max = start.advanced(by: substringRange.location + substringRange.length)
-                            substring = String(string.utf16[min..<max])
+                            substring = String(string.utf16[min..<max])!
                         }
                         str.replaceCharacters(in: rangeToReplace, with: substring)
 

Foundation/NSString.swift

@@ -311,7 +311,7 @@ public class NSString : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, N
     }
 
     public required init(stringLiteral value: StaticString) {
-        _storage = String(value)
+        _storage = String(describing: value)
     }
 
     internal var _fastCStringContents: UnsafePointer<Int8>? {
@@ -366,7 +366,7 @@ extension NSString {
 
     public func substring(from: Int) -> String {
         if self.dynamicType == NSString.self || self.dynamicType == NSMutableString.self {
-            return String(_storage.utf16.suffix(from: _storage.utf16.startIndex.advanced(by: from)))
+            return String(_storage.utf16.suffix(from: _storage.utf16.startIndex.advanced(by: from)))!
         } else {
             return substring(with: NSMakeRange(from, length - from))
         }
@@ -375,7 +375,7 @@ extension NSString {
     public func substring(to: Int) -> String {
         if self.dynamicType == NSString.self || self.dynamicType == NSMutableString.self {
             return String(_storage.utf16.prefix(upTo: _storage.utf16.startIndex
-            .advanced(by: to)))
+            .advanced(by: to)))!
         } else {
             return substring(with: NSMakeRange(0, to))
         }
@@ -386,11 +386,11 @@ extension NSString {
             let start = _storage.utf16.startIndex
             let min = start.advanced(by: range.location)
             let max = start.advanced(by: range.location + range.length)
-            return String(_storage.utf16[min..<max])
+            return String(_storage.utf16[min..<max])!
         } else {
             let buff = UnsafeMutablePointer<unichar>.allocate(capacity: range.length)
             getCharacters(buff, range: range)
-            let result = String(buff)
+            let result = String(describing: buff)
             buff.deinitialize()
             buff.deallocate(capacity: range.length)
             return result

Foundation/NSXMLParser.swift

@@ -61,7 +61,7 @@ internal func _NSXMLParserExternalEntityWithURL(_ interface: _CFXMLInterface, ur
     let policy = parser.externalEntityResolvingPolicy
     var a: URL?
     if let allowedEntityURLs = parser.allowedExternalEntityURLs {
-        if let url = URL(string: String(urlStr)) {
+        if let url = URL(string: String(describing: urlStr)) {
             a = url
             if let scheme = url.scheme {
                 if scheme == "file" {
@@ -84,7 +84,7 @@ internal func _NSXMLParserExternalEntityWithURL(_ interface: _CFXMLInterface, ur
         guard let url = parser._url else { break }
 
         if a == nil {
-            a = URL(string: String(urlStr))
+            a = URL(string: String(describing: urlStr))
         }
 
         guard let aUrl = a else { break }