@@ -99,19 +99,19 @@ UnsafeMutableBufferPointerSliceTests.test(
99
99
}
100
100
101
101
UnsafeMutableBufferPointerSliceTests . test (
102
- " slice.of.UnsafeMutableBufferPointer.initialize.fromElements .Collection "
102
+ " slice.of.UnsafeMutableBufferPointer.initialize.fromContentsOf .Collection "
103
103
) {
104
104
let c = 4
105
105
let mb = UnsafeMutableBufferPointer< String> . allocate( capacity: c)
106
106
defer { mb. deallocate ( ) }
107
107
108
- var ct = mb. initialize ( fromElements : ( 1 ... c) . map ( String . init) )
108
+ var ct = mb. initialize ( fromContentsOf : ( 1 ... c) . map ( String . init) )
109
109
expectEqual ( ct, c)
110
110
expectEqual ( mb. compactMap ( Int . init) . reduce ( 0 , + ) , c* ( c+ 1 ) / 2 )
111
111
var rb = mb. deinitialize ( )
112
112
expectEqual ( rb. count, c*MemoryLayout< String> . stride)
113
113
114
- ct = mb [ ... ] . initialize ( fromElements : ( 1 ... c) . map ( String . init) )
114
+ ct = mb [ ... ] . initialize ( fromContentsOf : ( 1 ... c) . map ( String . init) )
115
115
expectEqual ( ct, c)
116
116
expectEqual ( mb. compactMap ( Int . init) . reduce ( 0 , + ) , c* ( c+ 1 ) / 2 )
117
117
rb = mb [ ... ] . deinitialize ( )
@@ -152,13 +152,13 @@ UnsafeMutableBufferPointerSliceTests.test(
152
152
expectEqual ( a, b)
153
153
154
154
var i = a. withContiguousMutableStorageIfAvailable {
155
- $0. update ( fromElements : ( 0 ..< c) . map ( String . init) )
155
+ $0. update ( fromContentsOf : ( 0 ..< c) . map ( String . init) )
156
156
}
157
157
expectEqual ( i, c)
158
158
expectEqual ( a. compactMap ( Int . init) . reduce ( 0 , + ) , c* ( c- 1 ) / 2 )
159
159
160
160
i = b. withContiguousMutableStorageIfAvailable {
161
- $0 [ ... ] . update ( fromElements : ( 0 ..< c) . map ( String . init) )
161
+ $0 [ ... ] . update ( fromContentsOf : ( 0 ..< c) . map ( String . init) )
162
162
}
163
163
expectEqual ( i, c)
164
164
expectEqual ( a, b)
@@ -179,25 +179,25 @@ UnsafeMutableBufferPointerSliceTests.test(
179
179
let b = UnsafeMutableBufferPointer< String> . allocate( capacity: c)
180
180
defer { b. deallocate ( ) }
181
181
182
- var i = buffer. initialize ( fromElements : source)
182
+ var i = buffer. initialize ( fromContentsOf : source)
183
183
expectEqual ( i, c)
184
- i = a. moveInitialize ( fromElements : buffer)
184
+ i = a. moveInitialize ( fromContentsOf : buffer)
185
185
expectEqual ( i, c)
186
186
expectTrue ( a. elementsEqual ( source) )
187
- i = buffer. initialize ( fromElements : source)
187
+ i = buffer. initialize ( fromContentsOf : source)
188
188
expectEqual ( i, c)
189
- i = b [ ... ] . moveInitialize ( fromElements : buffer)
189
+ i = b [ ... ] . moveInitialize ( fromContentsOf : buffer)
190
190
expectEqual ( i, c)
191
191
expectTrue ( b. elementsEqual ( source) )
192
192
193
- i = buffer. initialize ( fromElements : source. prefix ( n) )
193
+ i = buffer. initialize ( fromContentsOf : source. prefix ( n) )
194
194
expectEqual ( i, n)
195
- i = a. moveInitialize ( fromElements : buffer. prefix ( n) )
195
+ i = a. moveInitialize ( fromContentsOf : buffer. prefix ( n) )
196
196
expectEqual ( i, n)
197
197
expectTrue ( a [ ..< n] . elementsEqual ( source. prefix ( n) ) )
198
- i = buffer. initialize ( fromElements : source. prefix ( n) )
198
+ i = buffer. initialize ( fromContentsOf : source. prefix ( n) )
199
199
expectEqual ( i, n)
200
- i = b [ ... ] . moveInitialize ( fromElements : buffer [ ..< n] )
200
+ i = b [ ... ] . moveInitialize ( fromContentsOf : buffer [ ..< n] )
201
201
expectEqual ( i, n)
202
202
expectTrue ( b. prefix ( n) . elementsEqual ( a [ ..< n] ) )
203
203
}
@@ -216,32 +216,32 @@ UnsafeMutableBufferPointerSliceTests.test(
216
216
var b = a
217
217
218
218
var i : Int ?
219
- i = buffer. initialize ( fromElements : source)
219
+ i = buffer. initialize ( fromContentsOf : source)
220
220
expectEqual ( i, c)
221
221
i = a. withContiguousMutableStorageIfAvailable {
222
- $0. moveUpdate ( fromElements : buffer)
222
+ $0. moveUpdate ( fromContentsOf : buffer)
223
223
}
224
224
expectEqual ( i, c)
225
225
expectEqual ( a, source)
226
- i = buffer. initialize ( fromElements : source)
226
+ i = buffer. initialize ( fromContentsOf : source)
227
227
expectEqual ( i, c)
228
228
i = b. withContiguousMutableStorageIfAvailable {
229
- $0 [ ... ] . moveUpdate ( fromElements : buffer)
229
+ $0 [ ... ] . moveUpdate ( fromContentsOf : buffer)
230
230
}
231
231
expectEqual ( i, c)
232
232
expectEqual ( a, b)
233
233
234
- i = buffer. initialize ( fromElements : source. prefix ( n) )
234
+ i = buffer. initialize ( fromContentsOf : source. prefix ( n) )
235
235
expectEqual ( i, n)
236
236
i = a. withContiguousMutableStorageIfAvailable {
237
- $0. moveUpdate ( fromElements : buffer [ ..< n] )
237
+ $0. moveUpdate ( fromContentsOf : buffer [ ..< n] )
238
238
}
239
239
expectEqual ( i, n)
240
240
expectEqual ( a [ ..< n] , source [ ..< n] )
241
- i = buffer. initialize ( fromElements : source. prefix ( n) )
241
+ i = buffer. initialize ( fromContentsOf : source. prefix ( n) )
242
242
expectEqual ( i, n)
243
243
i = b. withContiguousMutableStorageIfAvailable {
244
- $0. moveUpdate ( fromElements : buffer [ ..< n] )
244
+ $0. moveUpdate ( fromContentsOf : buffer [ ..< n] )
245
245
}
246
246
expectEqual ( i, n)
247
247
expectEqual ( a [ ..< n] , b [ ..< n] )
@@ -279,17 +279,17 @@ UnsafeMutableBufferPointerSliceTests.test(
279
279
280
280
var a = UnsafeMutableBufferPointer< String> . allocate( capacity: c)
281
281
defer { a. deallocate ( ) }
282
- a. initialize ( fromElements : Array ( repeating: " . " , count: c) )
282
+ a. initialize ( fromContentsOf : Array ( repeating: " . " , count: c) )
283
283
defer { a. deinitialize ( ) }
284
284
285
285
var i = a. withContiguousMutableStorageIfAvailable {
286
- $0. update ( fromElements : Array ( repeating: " " , count: c) )
286
+ $0. update ( fromContentsOf : Array ( repeating: " " , count: c) )
287
287
}
288
288
expectEqual ( i, c)
289
289
expectTrue ( a. allSatisfy ( { $0 == " " } ) )
290
290
291
291
i = a [ ... ] . withContiguousMutableStorageIfAvailable {
292
- $0. update ( fromElements : Array ( repeating: " ? " , count: c) )
292
+ $0. update ( fromContentsOf : Array ( repeating: " ? " , count: c) )
293
293
}
294
294
expectEqual ( i, c)
295
295
expectTrue ( a. allSatisfy ( { $0 == " ? " } ) )
@@ -432,7 +432,7 @@ UnsafeMutableRawBufferPointerSliceTests.test(
432
432
}
433
433
434
434
UnsafeMutableBufferPointerSliceTests . test (
435
- " slice.of.UnsafeMutableRawBufferpointer.initializeMemory.fromElements "
435
+ " slice.of.UnsafeMutableRawBufferpointer.initializeMemory.fromContentsOf "
436
436
) {
437
437
let c = 4
438
438
let mb = UnsafeMutableRawBufferPointer . allocate (
@@ -441,14 +441,14 @@ UnsafeMutableBufferPointerSliceTests.test(
441
441
)
442
442
defer { mb. deallocate ( ) }
443
443
444
- var tb = mb. initializeMemory ( as: Int . self, fromElements : 0 ..< c)
444
+ var tb = mb. initializeMemory ( as: Int . self, fromContentsOf : 0 ..< c)
445
445
expectEqual ( tb. count, c)
446
446
expectTrue ( tb. elementsEqual ( 0 ..< c) )
447
447
var rb = tb. deinitialize ( )
448
448
expectEqual ( rb. baseAddress, mb. baseAddress)
449
449
expectEqual ( rb. count, mb. count)
450
450
451
- tb = mb [ ... ] . initializeMemory ( as: Int . self, fromElements : 0 ..< c)
451
+ tb = mb [ ... ] . initializeMemory ( as: Int . self, fromContentsOf : 0 ..< c)
452
452
expectEqual ( tb. count, c)
453
453
expectTrue ( tb. elementsEqual ( 0 ..< c) )
454
454
rb = tb. deinitialize ( )
@@ -477,13 +477,13 @@ UnsafeMutableBufferPointerSliceTests.test(
477
477
)
478
478
defer { rbb. deallocate ( ) }
479
479
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)
482
482
expectEqual ( tba. count, c)
483
483
expectTrue ( tba. elementsEqual ( source) )
484
484
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)
487
487
expectEqual ( tbb. count, c)
488
488
expectTrue ( tbb. elementsEqual ( tba) )
489
489
@@ -492,13 +492,13 @@ UnsafeMutableBufferPointerSliceTests.test(
492
492
expectEqual ( dba. count, rba. count)
493
493
expectEqual ( dbb. count, rbb. count)
494
494
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) )
497
497
expectEqual ( tba. count, n)
498
498
expectTrue ( tba. elementsEqual ( source. prefix ( n) ) )
499
499
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] )
502
502
expectEqual ( tbb. count, n)
503
503
expectTrue ( tbb. elementsEqual ( tba) )
504
504
0 commit comments