Skip to content

Commit 3e22d3a

Browse files
committed
[test] update to use the fromContentsOf argument label
1 parent 8ed1fc7 commit 3e22d3a

File tree

1 file changed

+35
-35
lines changed

1 file changed

+35
-35
lines changed

validation-test/stdlib/UnsafeBufferPointerSlices.swift

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,19 @@ UnsafeMutableBufferPointerSliceTests.test(
9999
}
100100

101101
UnsafeMutableBufferPointerSliceTests.test(
102-
"slice.of.UnsafeMutableBufferPointer.initialize.fromElements.Collection"
102+
"slice.of.UnsafeMutableBufferPointer.initialize.fromContentsOf.Collection"
103103
) {
104104
let c = 4
105105
let mb = UnsafeMutableBufferPointer<String>.allocate(capacity: c)
106106
defer { mb.deallocate() }
107107

108-
var ct = mb.initialize(fromElements: (1...c).map(String.init))
108+
var ct = mb.initialize(fromContentsOf: (1...c).map(String.init))
109109
expectEqual(ct, c)
110110
expectEqual(mb.compactMap(Int.init).reduce(0,+), c*(c+1)/2)
111111
var rb = mb.deinitialize()
112112
expectEqual(rb.count, c*MemoryLayout<String>.stride)
113113

114-
ct = mb[...].initialize(fromElements: (1...c).map(String.init))
114+
ct = mb[...].initialize(fromContentsOf: (1...c).map(String.init))
115115
expectEqual(ct, c)
116116
expectEqual(mb.compactMap(Int.init).reduce(0,+), c*(c+1)/2)
117117
rb = mb[...].deinitialize()
@@ -152,13 +152,13 @@ UnsafeMutableBufferPointerSliceTests.test(
152152
expectEqual(a, b)
153153

154154
var i = a.withContiguousMutableStorageIfAvailable {
155-
$0.update(fromElements: (0..<c).map(String.init))
155+
$0.update(fromContentsOf: (0..<c).map(String.init))
156156
}
157157
expectEqual(i, c)
158158
expectEqual(a.compactMap(Int.init).reduce(0,+), c*(c-1)/2)
159159

160160
i = b.withContiguousMutableStorageIfAvailable {
161-
$0[...].update(fromElements: (0..<c).map(String.init))
161+
$0[...].update(fromContentsOf: (0..<c).map(String.init))
162162
}
163163
expectEqual(i, c)
164164
expectEqual(a, b)
@@ -179,25 +179,25 @@ UnsafeMutableBufferPointerSliceTests.test(
179179
let b = UnsafeMutableBufferPointer<String>.allocate(capacity: c)
180180
defer { b.deallocate() }
181181

182-
var i = buffer.initialize(fromElements: source)
182+
var i = buffer.initialize(fromContentsOf: source)
183183
expectEqual(i, c)
184-
i = a.moveInitialize(fromElements: buffer)
184+
i = a.moveInitialize(fromContentsOf: buffer)
185185
expectEqual(i, c)
186186
expectTrue(a.elementsEqual(source))
187-
i = buffer.initialize(fromElements: source)
187+
i = buffer.initialize(fromContentsOf: source)
188188
expectEqual(i, c)
189-
i = b[...].moveInitialize(fromElements: buffer)
189+
i = b[...].moveInitialize(fromContentsOf: buffer)
190190
expectEqual(i, c)
191191
expectTrue(b.elementsEqual(source))
192192

193-
i = buffer.initialize(fromElements: source.prefix(n))
193+
i = buffer.initialize(fromContentsOf: source.prefix(n))
194194
expectEqual(i, n)
195-
i = a.moveInitialize(fromElements: buffer.prefix(n))
195+
i = a.moveInitialize(fromContentsOf: buffer.prefix(n))
196196
expectEqual(i, n)
197197
expectTrue(a[..<n].elementsEqual(source.prefix(n)))
198-
i = buffer.initialize(fromElements: source.prefix(n))
198+
i = buffer.initialize(fromContentsOf: source.prefix(n))
199199
expectEqual(i, n)
200-
i = b[...].moveInitialize(fromElements: buffer[..<n])
200+
i = b[...].moveInitialize(fromContentsOf: buffer[..<n])
201201
expectEqual(i, n)
202202
expectTrue(b.prefix(n).elementsEqual(a[..<n]))
203203
}
@@ -216,32 +216,32 @@ UnsafeMutableBufferPointerSliceTests.test(
216216
var b = a
217217

218218
var i: Int?
219-
i = buffer.initialize(fromElements: source)
219+
i = buffer.initialize(fromContentsOf: source)
220220
expectEqual(i, c)
221221
i = a.withContiguousMutableStorageIfAvailable {
222-
$0.moveUpdate(fromElements: buffer)
222+
$0.moveUpdate(fromContentsOf: buffer)
223223
}
224224
expectEqual(i, c)
225225
expectEqual(a, source)
226-
i = buffer.initialize(fromElements: source)
226+
i = buffer.initialize(fromContentsOf: source)
227227
expectEqual(i, c)
228228
i = b.withContiguousMutableStorageIfAvailable {
229-
$0[...].moveUpdate(fromElements: buffer)
229+
$0[...].moveUpdate(fromContentsOf: buffer)
230230
}
231231
expectEqual(i, c)
232232
expectEqual(a, b)
233233

234-
i = buffer.initialize(fromElements: source.prefix(n))
234+
i = buffer.initialize(fromContentsOf: source.prefix(n))
235235
expectEqual(i, n)
236236
i = a.withContiguousMutableStorageIfAvailable {
237-
$0.moveUpdate(fromElements: buffer[..<n])
237+
$0.moveUpdate(fromContentsOf: buffer[..<n])
238238
}
239239
expectEqual(i, n)
240240
expectEqual(a[..<n], source[..<n])
241-
i = buffer.initialize(fromElements: source.prefix(n))
241+
i = buffer.initialize(fromContentsOf: source.prefix(n))
242242
expectEqual(i, n)
243243
i = b.withContiguousMutableStorageIfAvailable {
244-
$0.moveUpdate(fromElements: buffer[..<n])
244+
$0.moveUpdate(fromContentsOf: buffer[..<n])
245245
}
246246
expectEqual(i, n)
247247
expectEqual(a[..<n], b[..<n])
@@ -279,17 +279,17 @@ UnsafeMutableBufferPointerSliceTests.test(
279279

280280
var a = UnsafeMutableBufferPointer<String>.allocate(capacity: c)
281281
defer { a.deallocate() }
282-
a.initialize(fromElements: Array(repeating: ".", count: c))
282+
a.initialize(fromContentsOf: Array(repeating: ".", count: c))
283283
defer { a.deinitialize() }
284284

285285
var i = a.withContiguousMutableStorageIfAvailable {
286-
$0.update(fromElements: Array(repeating: " ", count: c))
286+
$0.update(fromContentsOf: Array(repeating: " ", count: c))
287287
}
288288
expectEqual(i, c)
289289
expectTrue(a.allSatisfy({ $0 == " " }))
290290

291291
i = a[...].withContiguousMutableStorageIfAvailable {
292-
$0.update(fromElements: Array(repeating: "?", count: c))
292+
$0.update(fromContentsOf: Array(repeating: "?", count: c))
293293
}
294294
expectEqual(i, c)
295295
expectTrue(a.allSatisfy({ $0 == "?" }))
@@ -432,7 +432,7 @@ UnsafeMutableRawBufferPointerSliceTests.test(
432432
}
433433

434434
UnsafeMutableBufferPointerSliceTests.test(
435-
"slice.of.UnsafeMutableRawBufferpointer.initializeMemory.fromElements"
435+
"slice.of.UnsafeMutableRawBufferpointer.initializeMemory.fromContentsOf"
436436
) {
437437
let c = 4
438438
let mb = UnsafeMutableRawBufferPointer.allocate(
@@ -441,14 +441,14 @@ UnsafeMutableBufferPointerSliceTests.test(
441441
)
442442
defer { mb.deallocate() }
443443

444-
var tb = mb.initializeMemory(as: Int.self, fromElements: 0..<c)
444+
var tb = mb.initializeMemory(as: Int.self, fromContentsOf: 0..<c)
445445
expectEqual(tb.count, c)
446446
expectTrue(tb.elementsEqual(0..<c))
447447
var rb = tb.deinitialize()
448448
expectEqual(rb.baseAddress, mb.baseAddress)
449449
expectEqual(rb.count, mb.count)
450450

451-
tb = mb[...].initializeMemory(as: Int.self, fromElements: 0..<c)
451+
tb = mb[...].initializeMemory(as: Int.self, fromContentsOf: 0..<c)
452452
expectEqual(tb.count, c)
453453
expectTrue(tb.elementsEqual(0..<c))
454454
rb = tb.deinitialize()
@@ -477,13 +477,13 @@ UnsafeMutableBufferPointerSliceTests.test(
477477
)
478478
defer { rbb.deallocate() }
479479

480-
expectEqual(buffer.initialize(fromElements: source), c)
481-
var tba = rba.moveInitializeMemory(as: Int.self, fromElements: buffer)
480+
expectEqual(buffer.initialize(fromContentsOf: source), c)
481+
var tba = rba.moveInitializeMemory(as: Int.self, fromContentsOf: buffer)
482482
expectEqual(tba.count, c)
483483
expectTrue(tba.elementsEqual(source))
484484

485-
expectEqual(buffer.initialize(fromElements: source), c)
486-
var tbb = rbb[...].moveInitializeMemory(as: Int.self, fromElements: buffer)
485+
expectEqual(buffer.initialize(fromContentsOf: source), c)
486+
var tbb = rbb[...].moveInitializeMemory(as: Int.self, fromContentsOf: buffer)
487487
expectEqual(tbb.count, c)
488488
expectTrue(tbb.elementsEqual(tba))
489489

@@ -492,13 +492,13 @@ UnsafeMutableBufferPointerSliceTests.test(
492492
expectEqual(dba.count, rba.count)
493493
expectEqual(dbb.count, rbb.count)
494494

495-
expectEqual(buffer.initialize(fromElements: source.prefix(n)), n)
496-
tba = rba.moveInitializeMemory(as: Int.self, fromElements: buffer.prefix(n))
495+
expectEqual(buffer.initialize(fromContentsOf: source.prefix(n)), n)
496+
tba = rba.moveInitializeMemory(as: Int.self, fromContentsOf: buffer.prefix(n))
497497
expectEqual(tba.count, n)
498498
expectTrue(tba.elementsEqual(source.prefix(n)))
499499

500-
expectEqual(buffer.initialize(fromElements: source.prefix(n)), n)
501-
tbb = rbb[...].moveInitializeMemory(as: Int.self, fromElements: buffer[..<n])
500+
expectEqual(buffer.initialize(fromContentsOf: source.prefix(n)), n)
501+
tbb = rbb[...].moveInitializeMemory(as: Int.self, fromContentsOf: buffer[..<n])
502502
expectEqual(tbb.count, n)
503503
expectTrue(tbb.elementsEqual(tba))
504504

0 commit comments

Comments
 (0)