Swift 3 API Parity: Data & NSData

Brings the Data and NSData API in s-cl-f to match the public version of Swift3 on Darwin. Reorganizes the implementation of Data/NSData to be a bit saner (versus somewhat vestigially matching the Objective-C categories on Darwin).  Also brings a whole host of tests over from our overlay (some disabled for now, since the real focus of this PR is the API parity, which we should have now).

Author: michael-lehew

Foundation/Data.swift

@@ -113,7 +113,8 @@ internal class NSConcreteValue : NSValue {
     }
 
     override var description : String {
-        return Data(bytes: self.value, count: self._size).description
+        let boundBytes = self.value.bindMemory(to: UInt8.self, capacity: self._size)
+        return Data(bytes: boundBytes, count: self._size).description
     }
 
     convenience required init?(coder aDecoder: NSCoder) {

Foundation/NSConcreteValue.swift

@@ -118,7 +118,7 @@ open class FileHandle: NSObject, NSSecureCoding {
     open func write(_ data: Data) {
         data.enumerateBytes() { (bytes, range, stop) in
             do {
-                try NSData.writeToFileDescriptor(self._fd, path: nil, buf: UnsafeRawPointer(bytes.baseAddress!), length: bytes.count)
+                try NSData.write(toFileDescriptor: self._fd, path: nil, buf: UnsafeRawPointer(bytes.baseAddress!), length: bytes.count)
             } catch {
                 fatalError("Write failure")
             }

Foundation/NSData.swift

@@ -686,7 +686,7 @@ open class FileManager: NSObject {
 
     open func createFile(atPath path: String, contents data: Data?, attributes attr: [String : Any]? = [:]) -> Bool {
         do {
-            try (data ?? Data()).write(to: URL(fileURLWithPath: path), options: .dataWritingAtomic)
+            try (data ?? Data()).write(to: URL(fileURLWithPath: path), options: .atomic)
             return true
         } catch _ {
             return false

Foundation/NSFileHandle.swift

@@ -831,7 +831,7 @@ extension NSString {
         return String.Encoding.unicode.rawValue
     }
 
-    public func data(using encoding: UInt, allowLossyConversion lossy: Bool) -> Data? {
+    public func data(using encoding: UInt, allowLossyConversion lossy: Bool = false) -> Data? {
         let len = length
         var reqSize = 0
 
@@ -844,7 +844,7 @@ extension NSString {
         if convertedLen != len {
             return nil 	// Not able to do it all...
         }
-                
+        
         if 0 < reqSize {
             var data = Data(count: reqSize)
             data.count = data.withUnsafeMutableBytes { (mutableBytes: UnsafeMutablePointer<UInt8>) -> Int in
@@ -1160,7 +1160,7 @@ extension NSString {
     internal func _writeTo(_ url: URL, _ useAuxiliaryFile: Bool, _ enc: UInt) throws {
         var data = Data()
         try _getExternalRepresentation(&data, url, enc)
-        try data.write(to: url, options: useAuxiliaryFile ? .dataWritingAtomic : [])
+        try data.write(to: url, options: useAuxiliaryFile ? .atomic : [])
     }
 
     open func write(to url: URL, atomically useAuxiliaryFile: Bool, encoding enc: UInt) throws {

Foundation/NSFileManager.swift

@@ -82,7 +82,7 @@ open class XMLDocument : XMLNode {
         @abstract Returns a document created from the contents of an XML or HTML URL. Connection problems such as 404, parse errors are returned in <tt>error</tt>.
     */
     public convenience init(contentsOf url: URL, options: Options) throws {
-        let data = try Data(contentsOf: url, options: .dataReadingMappedIfSafe)
+        let data = try Data(contentsOf: url, options: .mappedIfSafe)
 
         try self.init(data: data, options: options)
     }

Foundation/NSString.swift

@@ -381,7 +381,7 @@ internal func _NSXMLParserProcessingInstruction(_ ctx: _CFXMLInterface, target:
 internal func _NSXMLParserCdataBlock(_ ctx: _CFXMLInterface, value: UnsafePointer<UInt8>, len: Int32) -> Void {
     let parser = ctx.parser
     if let delegate = parser.delegate {
-        delegate.parser(parser, foundCDATA: Data(bytes: UnsafeRawPointer(value), count: Int(len)))
+        delegate.parser(parser, foundCDATA: Data(bytes: value, count: Int(len)))
     }
 }
 
@@ -551,9 +551,9 @@ open class XMLParser : NSObject {
                 _bomChunk = nil
 
                 if (totalLength > 4) {
-                    let remainingData = allExistingData.withUnsafeBytes { (bytes: UnsafePointer<Int8>) -> Data in
+                    let remainingData = allExistingData.withUnsafeMutableBytes { (bytes: UnsafeMutablePointer<UInt8>) -> Data in
                         let ptr = bytes.advanced(by: 4)
-                        return Data(bytesNoCopy: UnsafeMutablePointer(mutating: ptr), count: totalLength - 4, deallocator: .none)
+                        return Data(bytesNoCopy: ptr, count: totalLength - 4, deallocator: .none)
                     }
 
                     let _ = parseData(remainingData)