Skip to content

Commit d849eb7

Browse files
atrickatrick
authored
Merge pull request swiftlang#454 from atrick/rawptr-initto
Update for SE-0107, rename initialize(with:) to initialize(to:).
2 parents 0fff57e + ed0b2ed commit d849eb7

File tree

8 files changed

+21
-21
lines changed

8 files changed

+21
-21
lines changed

‎Foundation/NSArray.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public class NSArray : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NS
7474
}
7575
let objects = UnsafeMutablePointer<AnyObject?>(allocatingCapacity: Int(cnt))
7676
for idx in 0..<cnt {
77-
objects.advanced(by: Int(idx)).initialize(with: aDecoder.decodeObject())
77+
objects.advanced(by: Int(idx)).initialize(to: aDecoder.decodeObject())
7878
}
7979
self.init(objects: UnsafePointer<AnyObject?>(objects), count: Int(cnt))
8080
objects.deinitialize(count: Int(cnt))

‎Foundation/NSCFString.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ internal func _CFSwiftStringGetBytes(_ str: AnyObject, encoding: CFStringEncodin
135135
for idx in 0..<range.length {
136136
let characterIndex = encodingView.index(start, offsetBy: idx + range.location)
137137
let character = encodingView[characterIndex]
138-
buffer.advanced(by: idx).initialize(with: character)
138+
buffer.advanced(by: idx).initialize(to: character)
139139
}
140140
}
141141
usedBufLen?.pointee = range.length
@@ -149,8 +149,8 @@ internal func _CFSwiftStringGetBytes(_ str: AnyObject, encoding: CFStringEncodin
149149
let character = encodingView[start.advanced(by: idx + range.location)]
150150
let byte0 = UInt8(character & 0x00ff)
151151
let byte1 = UInt8((character >> 8) & 0x00ff)
152-
buffer.advanced(by: idx * 2).initialize(with: byte0)
153-
buffer.advanced(by: (idx * 2) + 1).initialize(with: byte1)
152+
buffer.advanced(by: idx * 2).initialize(to: byte0)
153+
buffer.advanced(by: (idx * 2) + 1).initialize(to: byte1)
154154
}
155155
}
156156
// Every character was 2 bytes

‎Foundation/NSDictionary.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ extension Dictionary : _ObjectTypeBridgeable {
2020
self.forEach {
2121
let key = _NSObjectRepresentableBridge($0.0)
2222
let value = _NSObjectRepresentableBridge($0.1)
23-
keyBuffer.advanced(by: idx).initialize(with: key)
24-
valueBuffer.advanced(by: idx).initialize(with: value)
23+
keyBuffer.advanced(by: idx).initialize(to: key)
24+
valueBuffer.advanced(by: idx).initialize(to: value)
2525
idx += 1
2626
}
2727

@@ -131,8 +131,8 @@ public class NSDictionary : NSObject, NSCopying, NSMutableCopying, NSSecureCodin
131131
let keys = UnsafeMutablePointer<NSObject>(allocatingCapacity: Int(cnt))
132132
let objects = UnsafeMutablePointer<AnyObject>(allocatingCapacity: Int(cnt))
133133
for idx in 0..<cnt {
134-
keys.advanced(by: Int(idx)).initialize(with: aDecoder.decodeObject()! as! NSObject)
135-
objects.advanced(by: Int(idx)).initialize(with: aDecoder.decodeObject()!)
134+
keys.advanced(by: Int(idx)).initialize(to: aDecoder.decodeObject()! as! NSObject)
135+
objects.advanced(by: Int(idx)).initialize(to: aDecoder.decodeObject()!)
136136
}
137137
self.init(objects: UnsafePointer<AnyObject>(objects), forKeys: UnsafePointer<NSObject>(keys), count: Int(cnt))
138138
keys.deinitialize(count: Int(cnt))

‎Foundation/NSFileManager.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -468,8 +468,8 @@ public class FileManager: NSObject {
468468

469469
let fsRep = FileManager.default().fileSystemRepresentation(withPath: path)
470470
let ps = UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>(allocatingCapacity: 2)
471-
ps.initialize(with: UnsafeMutablePointer(fsRep))
472-
ps.advanced(by: 1).initialize(with: nil)
471+
ps.initialize(to: UnsafeMutablePointer(fsRep))
472+
ps.advanced(by: 1).initialize(to: nil)
473473
let stream = fts_open(ps, FTS_PHYSICAL | FTS_XDEV | FTS_NOCHDIR, nil)
474474
ps.deinitialize(count: 2)
475475
ps.deallocateCapacity(2)
@@ -703,7 +703,7 @@ public class FileManager: NSObject {
703703
}
704704
let buf = UnsafeMutablePointer<Int8>(allocatingCapacity: len)
705705
for i in 0..<len {
706-
buf.advanced(by: i).initialize(with: 0)
706+
buf.advanced(by: i).initialize(to: 0)
707707
}
708708
if !path._nsObject.getFileSystemRepresentation(buf, maxLength: len) {
709709
buf.deinitialize(count: len)
@@ -914,8 +914,8 @@ extension FileManager {
914914
if FileManager.default().fileExists(atPath: path) {
915915
let fsRep = FileManager.default().fileSystemRepresentation(withPath: path)
916916
let ps = UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>(allocatingCapacity: 2)
917-
ps.initialize(with: UnsafeMutablePointer(fsRep))
918-
ps.advanced(by: 1).initialize(with: nil)
917+
ps.initialize(to: UnsafeMutablePointer(fsRep))
918+
ps.advanced(by: 1).initialize(to: nil)
919919
_stream = fts_open(ps, FTS_PHYSICAL | FTS_XDEV | FTS_NOCHDIR, nil)
920920
ps.deinitialize(count: 2)
921921
ps.deallocateCapacity(2)

‎Foundation/NSOrderedSet.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ extension NSOrderedSet {
287287
public convenience init(array: [AnyObject]) {
288288
let buffer = UnsafeMutablePointer<AnyObject?>(allocatingCapacity: array.count)
289289
for (idx, element) in array.enumerated() {
290-
buffer.advanced(by: idx).initialize(with: element)
290+
buffer.advanced(by: idx).initialize(to: element)
291291
}
292292
self.init(objects: buffer, count: array.count)
293293
buffer.deinitialize(count: array.count)

‎Foundation/NSSet.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ extension Set : _ObjectTypeBridgeable {
1515
let buffer = UnsafeMutablePointer<AnyObject?>(allocatingCapacity: count)
1616

1717
for (idx, obj) in enumerated() {
18-
buffer.advanced(by: idx).initialize(with: _NSObjectRepresentableBridge(obj))
18+
buffer.advanced(by: idx).initialize(to: _NSObjectRepresentableBridge(obj))
1919
}
2020

2121
let set = NSSet(objects: buffer, count: count)
@@ -124,7 +124,7 @@ public class NSSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSCo
124124
}
125125
let objects = UnsafeMutablePointer<AnyObject?>(allocatingCapacity: Int(cnt))
126126
for idx in 0..<cnt {
127-
objects.advanced(by: Int(idx)).initialize(with: aDecoder.decodeObject())
127+
objects.advanced(by: Int(idx)).initialize(to: aDecoder.decodeObject())
128128
}
129129
self.init(objects: UnsafePointer<AnyObject?>(objects), count: Int(cnt))
130130
objects.deinitialize(count: Int(cnt))
@@ -203,7 +203,7 @@ public class NSSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSCo
203203
public convenience init(array: [AnyObject]) {
204204
let buffer = UnsafeMutablePointer<AnyObject?>(allocatingCapacity: array.count)
205205
for (idx, element) in array.enumerated() {
206-
buffer.advanced(by: idx).initialize(with: element)
206+
buffer.advanced(by: idx).initialize(to: element)
207207
}
208208
self.init(objects: buffer, count: array.count)
209209
buffer.deinitialize(count: array.count)

‎Foundation/NSString.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ internal func _bytesInEncoding(_ str: NSString, _ encoding: String.Encoding, _ f
192192
fatalError("Internal inconsistency; previously claimed getBytes returned success but failed with similar invocation")
193193
}
194194

195-
UnsafeMutablePointer<Int8>(buffer).advanced(by: cLength).initialize(with: 0)
195+
UnsafeMutablePointer<Int8>(buffer).advanced(by: cLength).initialize(to: 0)
196196

197197
return UnsafePointer<Int8>(buffer) // leaked and should be autoreleased via a NSData backing but we cannot here
198198
}
@@ -884,12 +884,12 @@ extension NSString {
884884
used = min(self.length, maxBufferCount - 1)
885885
buffer.moveAssign(from: unsafeBitCast(_storage._core.startASCII, to: UnsafeMutablePointer<Int8>.self)
886886
, count: used)
887-
buffer.advanced(by: used).initialize(with: 0)
887+
buffer.advanced(by: used).initialize(to: 0)
888888
return true
889889
}
890890
}
891891
if getBytes(UnsafeMutablePointer<Void>(buffer), maxLength: maxBufferCount, usedLength: &used, encoding: encoding, options: [], range: NSMakeRange(0, self.length), remaining: nil) {
892-
buffer.advanced(by: used).initialize(with: 0)
892+
buffer.advanced(by: used).initialize(to: 0)
893893
return true
894894
}
895895
return false

‎Foundation/NSURL.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ public class NSURL: NSObject, NSSecureCoding, NSCopying {
501501

502502
let _fsrBuffer = UnsafeMutablePointer<Int8>(allocatingCapacity: bufSize)
503503
for i in 0..<bufSize {
504-
_fsrBuffer.advanced(by: i).initialize(with: 0)
504+
_fsrBuffer.advanced(by: i).initialize(to: 0)
505505
}
506506

507507
if getFileSystemRepresentation(_fsrBuffer, maxLength: bufSize) {

0 commit comments

Comments
 (0)