Correct URL bridging and exposure on Linux

(Truly correct bridging to be integrated with #555)

Author: Itai Ferber

Foundation/NSUserDefaults.swift

@@ -227,12 +227,10 @@ open class UserDefaults: NSObject {
                     return
                 }
             #else
-                if let urlPath = url.path {
-                    //FIXME: stringByAbbreviatingWithTildeInPath isn't implemented in SwiftFoundation
-                    //TODO: use stringByAbbreviatingWithTildeInPath when it is
-                    setObject(urlPath._nsObject, forKey: defaultName)
-                    return
-                }
+                //FIXME: stringByAbbreviatingWithTildeInPath isn't implemented in SwiftFoundation
+                //TODO: use stringByAbbreviatingWithTildeInPath when it is
+                setObject(url.path._nsObject, forKey: defaultName)
+                return
             #endif
             let data = NSKeyedArchiver.archivedData(withRootObject: url._nsObject)
             setObject(data._nsObject, forKey: defaultName)

Foundation/URL.swift

@@ -752,7 +752,7 @@ public struct URL : ReferenceConvertible, Equatable {
             return self
         }
 
-        if let result = _url.deletingLastPathComponent.map({ URL(reference: $0 as NSURL) }) {
+        if let result = _url.deletingLastPathComponent {
             return result
         } else {
             return self
@@ -785,7 +785,7 @@ public struct URL : ReferenceConvertible, Equatable {
             return self
         }
 
-        if let result = _url.deletingPathExtension.map({ URL(reference: $0 as NSURL) }) {
+        if let result = _url.deletingPathExtension {
             return result
         } else {
             return self
@@ -837,7 +837,7 @@ public struct URL : ReferenceConvertible, Equatable {
     /// Returns a `URL` with any instances of ".." or "." removed from its path.
     public var standardized : URL {
         // The NSURL API can only return nil in case of file reference URL, which we should not be
-        if let result = _url.standardized.map({ URL(reference: $0 as NSURL) }) {
+        if let result = _url.standardized {
             return result
         } else {
             return self
@@ -856,7 +856,7 @@ public struct URL : ReferenceConvertible, Equatable {
     /// If the `isFileURL` is false, this method returns `self`.
     public var standardizedFileURL : URL {
         // NSURL should not return nil here unless this is a file reference URL, which should be impossible
-        if let result = _url.standardizingPath.map({ URL(reference: $0 as NSURL) }) {
+        if let result = _url.standardizingPath {
             return result
         } else {
             return self
@@ -868,7 +868,7 @@ public struct URL : ReferenceConvertible, Equatable {
     /// If the `isFileURL` is false, this method returns `self`.
     public func resolvingSymlinksInPath() -> URL {
         // NSURL should not return nil here unless this is a file reference URL, which should be impossible
-        if let result = _url.resolvingSymlinksInPath.map({ URL(reference: $0 as NSURL) }) {
+        if let result = _url.resolvingSymlinksInPath {
             return result
         } else {
             return self
@@ -927,26 +927,6 @@ public struct URL : ReferenceConvertible, Equatable {
         _url.removeCachedResourceValue(forKey: key)
     }
 
-    @available(*, unavailable, message: "Use struct URLResourceValues and URL.setResourceValues(_:) instead")
-    public func setResourceValue(_ value: AnyObject?, forKey key: URLResourceKey) throws {
-        fatalError()
-    }
-    
-    @available(*, unavailable, message: "Use struct URLResourceValues and URL.setResourceValues(_:) instead")
-    public func setResourceValues(_ keyedValues: [URLResourceKey : AnyObject]) throws {
-        fatalError()
-    }
-    
-    @available(*, unavailable, message: "Use struct URLResourceValues and URL.resourceValues(forKeys:) instead")
-    public func resourceValues(forKeys keys: [URLResourceKey]) throws -> [URLResourceKey : AnyObject] {
-        fatalError()
-    }
-    
-    @available(*, unavailable, message: "Use struct URLResourceValues and URL.setResourceValues(_:) instead")
-    public func getResourceValue(_ value: AutoreleasingUnsafeMutablePointer<AnyObject?>, forKey key: URLResourceKey) throws {
-        fatalError()
-    }
-    
     // MARK: - Bridging Support
 
     /// We must not store an NSURL without running it through this function. This makes sure that we do not hold a file reference URL, which changes the nullability of many NSURL functions.
@@ -968,15 +948,15 @@ public struct URL : ReferenceConvertible, Equatable {
     }
 }
 
-extension URL : _ObjectiveCBridgeable {
+extension URL {
     @_semantics("convertToObjectiveC")
     public func _bridgeToObjectiveC() -> NSURL {
         return _url
     }
 
     public static func _forceBridgeFromObjectiveC(_ source: NSURL, result: inout URL?) {
         if !_conditionallyBridgeFromObjectiveC(source, result: &result) {
-            fatalError("Unable to bridge \(_ObjectiveCType.self) to \(self)")
+            fatalError("Unable to bridge \(NSURL.self) to \(self)")
         }
     }
 
@@ -1002,14 +982,6 @@ extension URL : CustomStringConvertible, CustomDebugStringConvertible {
     }
 }
 
-extension NSURL : _HasCustomAnyHashableRepresentation {
-    // Must be @nonobjc to avoid infinite recursion during bridging.
-    @nonobjc
-    public func _toCustomAnyHashable() -> AnyHashable? {
-        return AnyHashable(self as URL)
-    }
-}
-
 extension URL : CustomPlaygroundQuickLookable {
     public var customPlaygroundQuickLook: PlaygroundQuickLook {
         return .url(absoluteString)