Revert "Continued update for SE-0107: Raw->Void migration."

This reverts commit 7ee8014.

Author: atrick

Foundation/Data.swift

@@ -173,8 +173,7 @@ public struct Data : ReferenceConvertible, CustomStringConvertible, Equatable, H
                 return nil
             case .custom(let b):
                 return { (ptr, len) in
-                    let bytePtr = ptr.bindMemory(to: UInt8.self, capacity: len)
-                    b(bytePtr, len)
+                    b(UnsafeMutablePointer<UInt8>(ptr), len)
                 }
             }
         }
@@ -440,8 +439,7 @@ public struct Data : ReferenceConvertible, CustomStringConvertible, Equatable, H
         _mapUnmanaged {
             $0.enumerateBytes { (ptr, range, stop) in
                 var stopv = false
-                let bytePtr = ptr.bindMemory(to: UInt8.self, capacity: range.length)
-                block(buffer: UnsafeBufferPointer(start: bytePtr, count: range.length), byteIndex: range.length, stop: &stopv)
+                block(buffer: UnsafeBufferPointer(start: UnsafePointer<UInt8>(ptr), count: range.length), byteIndex: range.length, stop: &stopv)
                 if stopv {
                     stop.pointee = true
                 }

Foundation/IndexPath.swift

@@ -158,7 +158,7 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
         if count == 0 {
             _indexes = []
         } else {
-            var ptr = malloc(count * sizeof(Element.self))?.bindMemory(to: Element.self, capacity: count * sizeof(Element.self))
+            var ptr = UnsafeMutablePointer<Element>(malloc(count * sizeof(Element.self)))
             defer { free(ptr) }
 
             nsIndexPath.getIndexes(ptr!, range: NSMakeRange(0, count))

Foundation/NSString.swift

@@ -194,7 +194,7 @@ internal func _bytesInEncoding(_ str: NSString, _ encoding: String.Encoding, _ f
 
     buffer.advanced(by: cLength).initialize(to: 0)
 
-    return UnsafePointer(buffer) // leaked and should be autoreleased via a NSData backing but we cannot here
+    return buffer // leaked and should be autoreleased via a NSData backing but we cannot here
 }
 
 internal func isALineSeparatorTypeCharacter(_ ch: unichar) -> Bool {
@@ -905,7 +905,7 @@ extension NSString {
                 let lossyOk = options.contains(.allowLossy)
                 let externalRep = options.contains(.externalRepresentation)
                 let failOnPartial = options.contains(.failOnPartialEncodingConversion)
-                let bytePtr = buffer?.bindMemory(to: UInt8.self, capacity: maxBufferCount)
+                let bytePtr = buffer?.bindMemory(as: UInt8.self, capacity: maxBufferCount)
                 numCharsProcessed = __CFStringEncodeByteStream(_cfObject, range.location, range.length, externalRep, cfStringEncoding, lossyOk ? (encoding == String.Encoding.ascii.rawValue ? 0xFF : 0x3F) : 0, bytePtr, bytePtr != nil ? maxBufferCount : 0, &totalBytesWritten)
                 if (failOnPartial && numCharsProcessed < range.length) || numCharsProcessed == 0 {
                     result = false
@@ -1230,7 +1230,7 @@ extension NSString {
     }
 
     public convenience init?(bytes: UnsafeRawPointer, length len: Int, encoding: UInt) {
-        let bytePtr = bytes.bindMemory(to: UInt8.self, capacity: len)
+        let bytePtr = bytes.bindMemory(as: UInt8.self, capacity: len)
         guard let cf = CFStringCreateWithBytes(kCFAllocatorDefault, bytePtr, len, CFStringConvertNSStringEncodingToEncoding(encoding), true) else {
             return nil
         }
@@ -1265,7 +1265,7 @@ extension NSString {
     public convenience init(contentsOf url: URL, encoding enc: UInt) throws {
         let readResult = try NSData(contentsOf: url, options: [])
 
-        let bytePtr = readResult.bytes.bindMemory(to: UInt8.self, capacity: readResult.length)
+        let bytePtr = readResult.bindMemory(as: UInt8.self, capacity: readResult.length)
         guard let cf = CFStringCreateWithBytes(kCFAllocatorDefault, bytePtr, readResult.length, CFStringConvertNSStringEncodingToEncoding(enc), true) else {
             throw NSError(domain: NSCocoaErrorDomain, code: NSCocoaError.FileReadInapplicableStringEncodingError.rawValue, userInfo: [
                 "NSDebugDescription" : "Unable to create a string using the specified encoding."
@@ -1402,7 +1402,7 @@ extension NSMutableString {
             let numOccurrences = CFArrayGetCount(findResults)
             for cnt in 0..<numOccurrences {
                 let rangePtr = CFArrayGetValueAtIndex(findResults, backwards ? cnt : numOccurrences - cnt - 1)
-                replaceCharacters(in: NSRange(rangePtr!.load(as: CFRange.self)), with: replacement)
+                replaceCharacters(in: NSRange(range!.load(as: CFRange)), with: replacement)
             }
             return numOccurrences
         } else {

Foundation/NSTask.swift

@@ -108,8 +108,7 @@ public class Task: NSObject {
                     emptySourceContext.equal = runloopIsEqual
                     emptySourceContext.perform = emptyRunLoopCallback
                     managerThreadRunLoop!.withUnretainedReference {
-                        (refPtr: UnsafeMutablePointer<UInt8>) in
-                        emptySourceContext.info = UnsafeMutableRawPointer(refPtr)
+                        emptySourceContext.info = $0
                     }
 
                     CFRunLoopAddSource(managerThreadRunLoop?._cfRunLoop, CFRunLoopSourceCreate(kCFAllocatorDefault, 0, &emptySourceContext), kCFRunLoopDefaultMode)
@@ -387,8 +386,7 @@ public class Task: NSObject {
         runLoopContext.equal = nstaskIsEqual
         runLoopContext.perform = emptyRunLoopCallback
         self.withUnretainedReference {
-            (refPtr: UnsafeMutablePointer<UInt8>) in
-            runLoopContext.info = UnsafeMutableRawPointer(refPtr)
+            runLoopContext.info = $0
         }
         self.runLoopSourceContext = runLoopContext
 

Foundation/NSTimer.swift

@@ -39,8 +39,7 @@ public class Timer: NSObject {
         _fire = block
         var context = CFRunLoopTimerContext()
         withRetainedReference {
-            (refPtr: UnsafeMutablePointer<UInt8>) in
-            context.info = UnsafeMutableRawPointer(refPtr)
+            context.info = $0
         }
         let timer = withUnsafeMutablePointer(&context) { (ctx: UnsafeMutablePointer<CFRunLoopTimerContext>) -> CFRunLoopTimer in
             var t = interval

Foundation/NSURL.swift

@@ -343,10 +343,10 @@ public class NSURL: NSObject, NSSecureCoding, NSCopying {
         let bytesNeeded = CFURLGetBytes(_cfObject, nil, 0)
         assert(bytesNeeded > 0)
 
-        let buffer = malloc(bytesNeeded)!.bindMemory(to: UInt8.self, capacity: bytesNeeded)
-        let bytesFilled = CFURLGetBytes(_cfObject, buffer, bytesNeeded)
+        let buffer = malloc(bytesNeeded)!
+        let bytesFilled = CFURLGetBytes(_cfObject, UnsafeMutablePointer<UInt8>(buffer), bytesNeeded)
         if bytesFilled == bytesNeeded {
-            return Data(bytesNoCopy: buffer, count: bytesNeeded, deallocator: .none)
+            return Data(bytesNoCopy: UnsafeMutablePointer<UInt8>(buffer), count: bytesNeeded, deallocator: .none)
         } else {
             fatalError()
         }

Foundation/NSXMLNode.swift

@@ -719,7 +719,7 @@ public class XMLNode: NSObject, NSCopying {
         var result: [XMLNode] = []
         for i in 0..<CFArrayGetCount(nodes) {
             let nodePtr = CFArrayGetValueAtIndex(nodes, i)!
-            result.append(XMLNode._objectNodeForNode(_CFXMLNodePtr(mutating: nodePtr)))
+            result.append(XMLNode._objectNodeForNode(_CFXMLNodePtr(nodePtr)))
         }
 
         return result

Foundation/NSXMLParser.swift

@@ -565,21 +565,21 @@ public class XMLParser : NSObject {
         XMLParser.setCurrentParser(self)
         if let stream = _stream {
             stream.open()
-            let buffer = malloc(_chunkSize)!.bindMemory(to: UInt8.self, capacity: _chunkSize)
-            var len = stream.read(buffer, maxLength: _chunkSize)
+            let buffer = malloc(_chunkSize)!
+            var len = stream.read(UnsafeMutablePointer<UInt8>(buffer), maxLength: _chunkSize)
             if len != -1 {
                 while len > 0 {
-                    let data = Data(bytesNoCopy: buffer, count: len, deallocator: .none)
+                    let data = Data(bytesNoCopy: UnsafeMutablePointer<UInt8>(buffer), count: len, deallocator: .none)
                     result = parseData(data)
-                    len = stream.read(buffer, maxLength: _chunkSize)
+                    len = stream.read(UnsafeMutablePointer<UInt8>(buffer), maxLength: _chunkSize)
                 }
             } else {
                 result = false
             }
             free(buffer)
             stream.close()
         } else if let data = _data {
-            let buffer = malloc(_chunkSize)!.bindMemory(to: UInt8.self, capacity: _chunkSize)
+            let buffer = malloc(_chunkSize)!
             var range = NSMakeRange(0, min(_chunkSize, data.count))
             while result {
                 let chunk = data.withUnsafeBytes { (buffer: UnsafePointer<UInt8>) -> Data in