Merge pull request #760 from airspeedswift/se-147

airspeedswift · web-flow · commit 507630ed124a · 2017-01-07T14:24:57.000-08:00
[stdlib] Implement SE-147: Move initialize(from:) from Pointer to BufferPointer
diff --git a/Foundation/Data.swift b/Foundation/Data.swift
@@ -1436,7 +1436,11 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
                 }
                 
                 if replacementCount != 0 {
-                    newElements._copyContents(initializing: bytes + start)
+                  let buf = UnsafeMutableBufferPointer(start: bytes + start, 
+                                                       count: replacementCount)
+                  var (it,idx) = newElements._copyContents(initializing: buf)
+                  precondition(it.next() == nil && idx == buf.endIndex,
+                    "newElements iterator returned different count to newElements.count")
                 }
             }
     }

Original file line number	Diff line number	Diff line change
`@@ -1436,7 +1436,11 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl`
`1436`	`1436`	`}`
`1437`	`1437`
`1438`	`1438`	`if replacementCount != 0 {`
`1439`		`- newElements._copyContents(initializing: bytes + start)`
	`1439`	`+ let buf = UnsafeMutableBufferPointer(start: bytes + start,`
	`1440`	`+ count: replacementCount)`
	`1441`	`+ var (it,idx) = newElements._copyContents(initializing: buf)`
	`1442`	`+ precondition(it.next() == nil && idx == buf.endIndex,`
	`1443`	`+ "newElements iterator returned different count to newElements.count")`
`1440`	`1444`	`}`
`1441`	`1445`	`}`
`1442`	`1446`	`}`