[SE-0101] .size to .stride

Author: rintaro

src/swift/Data.swift

@@ -118,10 +118,10 @@ public struct DispatchData : RandomAccessCollection {
 	///
 	/// - parameter buffer: The buffer of bytes to append. The size is calculated from `SourceType` and `buffer.count`.
 	public mutating func append<SourceType>(_ buffer : UnsafeBufferPointer<SourceType>) {
-    let count = buffer.count * MemoryLayout<SourceType>.stride;
-	  buffer.baseAddress?.withMemoryRebound(to: UInt8.self, capacity: count) {
-	    self.append($0, count: count)
-    }
+		let count = buffer.count * MemoryLayout<SourceType>.stride;
+		buffer.baseAddress?.withMemoryRebound(to: UInt8.self, capacity: count) {
+			self.append($0, count: count)
+		}
 	}
 
 	private func _copyBytesHelper(to pointer: UnsafeMutablePointer<UInt8>, from range: CountableRange<Index>) {
@@ -154,7 +154,7 @@ public struct DispatchData : RandomAccessCollection {
 
 	/// Copy the contents of the data into a buffer.
 	///
-	/// This function copies the bytes in `range` from the data into the buffer. If the count of the `range` is greater than `MemoryLayout<DestinationType>.size * buffer.count` then the first N bytes will be copied into the buffer.
+	/// This function copies the bytes in `range` from the data into the buffer. If the count of the `range` is greater than `MemoryLayout<DestinationType>.stride * buffer.count` then the first N bytes will be copied into the buffer.
 	/// - precondition: The range must be within the bounds of the data. Otherwise `fatalError` is called.
 	/// - parameter buffer: A buffer to copy the data into.
 	/// - parameter range: A range in the data to copy into the buffer. If the range is empty, this function will return 0 without copying anything. If the range is nil, as much data as will fit into `buffer` is copied.
@@ -172,17 +172,17 @@ public struct DispatchData : RandomAccessCollection {
 			precondition(r.endIndex >= 0)
 			precondition(r.endIndex <= cnt, "The range is outside the bounds of the data")
 
-			copyRange = r.startIndex..<(r.startIndex + Swift.min(buffer.count * MemoryLayout<DestinationType>.size, r.count))
+			copyRange = r.startIndex..<(r.startIndex + Swift.min(buffer.count * MemoryLayout<DestinationType>.stride, r.count))
 		} else {
-			copyRange = 0..<Swift.min(buffer.count * MemoryLayout<DestinationType>.size, cnt)
+			copyRange = 0..<Swift.min(buffer.count * MemoryLayout<DestinationType>.stride, cnt)
 		}
 
 		guard !copyRange.isEmpty else { return 0 }
 
 		let bufferCapacity = buffer.count * MemoryLayout<DestinationType>.stride
- 	  buffer.baseAddress?.withMemoryRebound(to: UInt8.self, capacity: bufferCapacity) {
-		  _copyBytesHelper(to: $0, from: copyRange)
-    }
+		buffer.baseAddress?.withMemoryRebound(to: UInt8.self, capacity: bufferCapacity) {
+			_copyBytesHelper(to: $0, from: copyRange)
+		}
 		return copyRange.count
 	}