Skip to content

Commit df239bb

Browse files
cwillmorcwillmor
committed
Update project for SE-0054 "Abolish IUO type"
1 parent c8645bd commit df239bb

15 files changed

+63
-63
lines changed

‎Foundation/NSBundle.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public class NSBundle : NSObject {
226226
// MARK: - Localized Strings
227227

228228
public func localizedStringForKey(_ key: String, value: String?, table tableName: String?) -> String {
229-
let localizedString = CFBundleCopyLocalizedString(_bundle, key._cfObject, value?._cfObject, tableName?._cfObject)
229+
let localizedString = CFBundleCopyLocalizedString(_bundle, key._cfObject, value?._cfObject, tableName?._cfObject)!
230230
return localizedString._swiftObject
231231
}
232232

@@ -273,7 +273,7 @@ public class NSBundle : NSObject {
273273
}
274274

275275
public var developmentLocalization: String? {
276-
let region = CFBundleGetDevelopmentRegion(_bundle)
276+
let region = CFBundleGetDevelopmentRegion(_bundle)!
277277
return region._swiftObject
278278
}
279279

@@ -284,12 +284,12 @@ public class NSBundle : NSObject {
284284
}
285285

286286
public class func preferredLocalizationsFromArray(_ localizationsArray: [String], forPreferences preferencesArray: [String]?) -> [String] {
287-
let localizations = CFBundleCopyLocalizationsForPreferences(localizationsArray._cfObject, preferencesArray?._cfObject)
287+
let localizations = CFBundleCopyLocalizationsForPreferences(localizationsArray._cfObject, preferencesArray?._cfObject)!
288288
return localizations._swiftObject.map { return ($0 as! NSString)._swiftObject }
289289
}
290290

291291
public var executableArchitectures: [NSNumber]? {
292-
let architectures = CFBundleCopyExecutableArchitectures(_bundle)
292+
let architectures = CFBundleCopyExecutableArchitectures(_bundle)!
293293
return architectures._swiftObject.map() { $0 as! NSNumber }
294294
}
295295
}

‎Foundation/NSData.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,14 +280,14 @@ extension NSData {
280280

281281
// Swift does not currently expose MAP_FAILURE
282282
if data != UnsafeMutablePointer<Void>(bitPattern: -1) {
283-
return NSDataReadResult(bytes: data, length: length) { buffer, length in
283+
return NSDataReadResult(bytes: data!, length: length) { buffer, length in
284284
munmap(buffer, length)
285285
}
286286
}
287287

288288
}
289289

290-
let data = malloc(length)
290+
let data = malloc(length)!
291291
var remaining = Int(info.st_size)
292292
var total = 0
293293
while remaining > 0 {

‎Foundation/NSDateFormatter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class NSDateFormatter : NSFormatter {
2222
let timeStyle = CFDateFormatterStyle(self.timeStyle.rawValue)
2323
#endif
2424

25-
let obj = CFDateFormatterCreate(kCFAllocatorSystemDefault, locale._cfObject, dateStyle, timeStyle)
25+
let obj = CFDateFormatterCreate(kCFAllocatorSystemDefault, locale._cfObject, dateStyle, timeStyle)!
2626
_setFormatterAttributes(obj)
2727
if let dateFormat = _dateFormat {
2828
CFDateFormatterSetFormat(obj, dateFormat._cfObject)

‎Foundation/NSFileManager.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -292,15 +292,15 @@ public class NSFileManager : NSObject {
292292
var entry = readdir(dir)
293293

294294
while entry != nil {
295-
if let entryName = withUnsafePointer(&entry.pointee.d_name, { (ptr) -> String? in
295+
if let entryName = withUnsafePointer(&entry!.pointee.d_name, { (ptr) -> String? in
296296
let int8Ptr = unsafeBitCast(ptr, to: UnsafePointer<Int8>.self)
297297
return String(cString: int8Ptr)
298298
}) {
299299
// TODO: `entryName` should be limited in length to `entry.memory.d_namlen`.
300300
if entryName != "." && entryName != ".." {
301301
contents.append(entryName)
302302

303-
if let entryType = withUnsafePointer(&entry.pointee.d_type, { (ptr) -> Int32? in
303+
if let entryType = withUnsafePointer(&entry!.pointee.d_type, { (ptr) -> Int32? in
304304
let int32Ptr = unsafeBitCast(ptr, to: UnsafePointer<UInt8>.self)
305305
return Int32(int32Ptr.pointee)
306306
}) {
@@ -352,14 +352,14 @@ public class NSFileManager : NSObject {
352352
result[NSFileSystemFileNumber] = NSNumber(unsignedLongLong: UInt64(s.st_ino))
353353

354354
let pwd = getpwuid(s.st_uid)
355-
if pwd != nil && pwd.pointee.pw_name != nil {
356-
let name = String(cString: pwd.pointee.pw_name)
355+
if pwd != nil && pwd!.pointee.pw_name != nil {
356+
let name = String(cString: pwd!.pointee.pw_name)
357357
result[NSFileOwnerAccountName] = name
358358
}
359359

360360
let grd = getgrgid(s.st_gid)
361-
if grd != nil && grd.pointee.gr_name != nil {
362-
let name = String(cString: grd.pointee.gr_name)
361+
if grd != nil && grd!.pointee.gr_name != nil {
362+
let name = String(cString: grd!.pointee.gr_name)
363363
result[NSFileGroupOwnerAccountID] = name
364364
}
365365

@@ -479,15 +479,15 @@ public class NSFileManager : NSObject {
479479

480480
var current = fts_read(stream)
481481
while current != nil {
482-
switch Int32(current.pointee.fts_info) {
482+
switch Int32(current!.pointee.fts_info) {
483483
case FTS_DEFAULT, FTS_F, FTS_NSOK, FTS_SL, FTS_SLNONE:
484-
if unlink(current.pointee.fts_path) == -1 {
485-
let str = NSString(bytes: current.pointee.fts_path, length: Int(strlen(current.pointee.fts_path)), encoding: NSUTF8StringEncoding)!._swiftObject
484+
if unlink(current!.pointee.fts_path) == -1 {
485+
let str = NSString(bytes: current!.pointee.fts_path, length: Int(strlen(current!.pointee.fts_path)), encoding: NSUTF8StringEncoding)!._swiftObject
486486
throw _NSErrorWithErrno(errno, reading: false, path: str)
487487
}
488488
case FTS_DP:
489-
if rmdir(current.pointee.fts_path) == -1 {
490-
let str = NSString(bytes: current.pointee.fts_path, length: Int(strlen(current.pointee.fts_path)), encoding: NSUTF8StringEncoding)!._swiftObject
489+
if rmdir(current!.pointee.fts_path) == -1 {
490+
let str = NSString(bytes: current!.pointee.fts_path, length: Int(strlen(current!.pointee.fts_path)), encoding: NSUTF8StringEncoding)!._swiftObject
491491
throw _NSErrorWithErrno(errno, reading: false, path: str)
492492
}
493493
default:

‎Foundation/NSKeyedArchiver.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public class NSKeyedArchiver : NSCoder {
154154
}
155155
}
156156

157-
let writeStream = _CFWriteStreamCreateFromFileDescriptor(kCFAllocatorSystemDefault, fd)
157+
let writeStream = _CFWriteStreamCreateFromFileDescriptor(kCFAllocatorSystemDefault, fd)!
158158

159159
if !CFWriteStreamOpen(writeStream) {
160160
return false

‎Foundation/NSKeyedUnarchiver.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public class NSKeyedUnarchiver : NSCoder {
6262

6363
public class func unarchiveObjectWithFile(_ path: String) -> AnyObject? {
6464
let url = NSURL(fileURLWithPath: path)
65-
let readStream = CFReadStreamCreateWithFile(kCFAllocatorSystemDefault, url._cfObject)
65+
let readStream = CFReadStreamCreateWithFile(kCFAllocatorSystemDefault, url._cfObject)!
6666
var root : AnyObject? = nil
6767

6868
if !CFReadStreamOpen(readStream) {

‎Foundation/NSNumber.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ public class NSNumber : NSValue {
290290
}
291291
var size: Int = 0
292292
NSGetSizeAndAlignment(objCType!, &size, nil)
293-
let buffer = malloc(size)
293+
let buffer = malloc(size)!
294294
aDecoder.decodeValueOfObjCType(objCType!, at: buffer)
295295
self.init(bytes: buffer, objCType: objCType!)
296296
free(buffer)

‎Foundation/NSNumberFormatter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class NSNumberFormatter : NSFormatter {
3636
let numberStyle = CFNumberFormatterStyle(self.numberStyle.rawValue)
3737
#endif
3838

39-
let obj = CFNumberFormatterCreate(kCFAllocatorSystemDefault, locale._cfObject, numberStyle)
39+
let obj = CFNumberFormatterCreate(kCFAllocatorSystemDefault, locale._cfObject, numberStyle)!
4040
_setFormatterAttributes(obj)
4141
_currentCfFormatter = obj
4242
return obj

‎Foundation/NSString.swift

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ extension String : _ObjectTypeBridgeable {
8585
let cf = unsafeBitCast(x, to: CFString.self)
8686
let str = CFStringGetCStringPtr(cf, CFStringEncoding(kCFStringEncodingUTF8))
8787
if str != nil {
88-
result = String(cString: str)
88+
result = String(cString: str!)
8989
} else {
9090
let length = CFStringGetLength(cf)
9191
let buffer = UnsafeMutablePointer<UniChar>(allocatingCapacity: length)
@@ -181,7 +181,7 @@ internal func _bytesInEncoding(_ str: NSString, _ encoding: NSStringEncoding, _
181181
return nil
182182
}
183183

184-
let buffer = malloc(cLength + 1)
184+
let buffer = malloc(cLength + 1)!
185185
if !str.getBytes(buffer, maxLength: cLength, usedLength: &used, encoding: encoding, options: options, range: theRange, remaining: nil) {
186186
fatalError("Internal inconsistency; previously claimed getBytes returned success but failed with similar invocation")
187187
}
@@ -691,19 +691,19 @@ extension NSString {
691691
}
692692

693693
public func uppercased(with locale: NSLocale?) -> String {
694-
let mutableCopy = CFStringCreateMutableCopy(kCFAllocatorSystemDefault, 0, self._cfObject)
694+
let mutableCopy = CFStringCreateMutableCopy(kCFAllocatorSystemDefault, 0, self._cfObject)!
695695
CFStringUppercase(mutableCopy, locale?._cfObject ?? nil)
696696
return mutableCopy._swiftObject
697697
}
698698

699699
public func lowercased(with locale: NSLocale?) -> String {
700-
let mutableCopy = CFStringCreateMutableCopy(kCFAllocatorSystemDefault, 0, self._cfObject)
700+
let mutableCopy = CFStringCreateMutableCopy(kCFAllocatorSystemDefault, 0, self._cfObject)!
701701
CFStringLowercase(mutableCopy, locale?._cfObject ?? nil)
702702
return mutableCopy._swiftObject
703703
}
704704

705705
public func capitalized(with locale: NSLocale?) -> String {
706-
let mutableCopy = CFStringCreateMutableCopy(kCFAllocatorSystemDefault, 0, self._cfObject)
706+
let mutableCopy = CFStringCreateMutableCopy(kCFAllocatorSystemDefault, 0, self._cfObject)!
707707
CFStringCapitalize(mutableCopy, locale?._cfObject ?? nil)
708708
return mutableCopy._swiftObject
709709
}
@@ -933,7 +933,7 @@ extension NSString {
933933
public class func availableStringEncodings() -> UnsafePointer<UInt> {
934934
struct once {
935935
static let encodings: UnsafePointer<UInt> = {
936-
let cfEncodings = CFStringGetListOfAvailableEncodings()
936+
let cfEncodings = CFStringGetListOfAvailableEncodings()!
937937
var idx = 0
938938
var numEncodings = 0
939939

@@ -971,28 +971,28 @@ extension NSString {
971971
}
972972

973973
public var decomposedStringWithCanonicalMapping: String {
974-
let string = CFStringCreateMutable(kCFAllocatorSystemDefault, 0)
974+
let string = CFStringCreateMutable(kCFAllocatorSystemDefault, 0)!
975975
CFStringReplaceAll(string, self._cfObject)
976976
CFStringNormalize(string, kCFStringNormalizationFormD)
977977
return string._swiftObject
978978
}
979979

980980
public var precomposedStringWithCanonicalMapping: String {
981-
let string = CFStringCreateMutable(kCFAllocatorSystemDefault, 0)
981+
let string = CFStringCreateMutable(kCFAllocatorSystemDefault, 0)!
982982
CFStringReplaceAll(string, self._cfObject)
983983
CFStringNormalize(string, kCFStringNormalizationFormC)
984984
return string._swiftObject
985985
}
986986

987987
public var decomposedStringWithCompatibilityMapping: String {
988-
let string = CFStringCreateMutable(kCFAllocatorSystemDefault, 0)
988+
let string = CFStringCreateMutable(kCFAllocatorSystemDefault, 0)!
989989
CFStringReplaceAll(string, self._cfObject)
990990
CFStringNormalize(string, kCFStringNormalizationFormKD)
991991
return string._swiftObject
992992
}
993993

994994
public var precomposedStringWithCompatibilityMapping: String {
995-
let string = CFStringCreateMutable(kCFAllocatorSystemDefault, 0)
995+
let string = CFStringCreateMutable(kCFAllocatorSystemDefault, 0)!
996996
CFStringReplaceAll(string, self._cfObject)
997997
CFStringNormalize(string, kCFStringNormalizationFormKC)
998998
return string._swiftObject
@@ -1080,13 +1080,13 @@ extension NSString {
10801080
fatalError("out of range padIndex")
10811081
}
10821082

1083-
let mStr = CFStringCreateMutableCopy(kCFAllocatorSystemDefault, 0, _cfObject)
1083+
let mStr = CFStringCreateMutableCopy(kCFAllocatorSystemDefault, 0, _cfObject)!
10841084
CFStringPad(mStr, padString._cfObject, newLength, padIndex)
10851085
return mStr._swiftObject
10861086
}
10871087

10881088
public func folding(_ options: NSStringCompareOptions = [], locale: NSLocale?) -> String {
1089-
let string = CFStringCreateMutable(kCFAllocatorSystemDefault, 0)
1089+
let string = CFStringCreateMutable(kCFAllocatorSystemDefault, 0)!
10901090
CFStringReplaceAll(string, self._cfObject)
10911091
CFStringFold(string, options._cfValue(), locale?._cfObject)
10921092
return string._swiftObject
@@ -1124,7 +1124,7 @@ extension NSString {
11241124
}
11251125

11261126
public func applyingTransform(_ transform: String, reverse: Bool) -> String? {
1127-
let string = CFStringCreateMutable(kCFAllocatorSystemDefault, 0)
1127+
let string = CFStringCreateMutable(kCFAllocatorSystemDefault, 0)!
11281128
CFStringReplaceAll(string, _cfObject)
11291129
if (CFStringTransform(string, nil, transform._cfObject, reverse)) {
11301130
return string._swiftObject
@@ -1196,7 +1196,7 @@ extension NSString {
11961196
}
11971197

11981198
public convenience init(format: String, arguments argList: CVaListPointer) {
1199-
let str = CFStringCreateWithFormatAndArguments(kCFAllocatorSystemDefault, nil, format._cfObject, argList)
1199+
let str = CFStringCreateWithFormatAndArguments(kCFAllocatorSystemDefault, nil, format._cfObject, argList)!
12001200
self.init(str._swiftObject)
12011201
}
12021202

@@ -1217,7 +1217,7 @@ extension NSString {
12171217
public convenience init(format: NSString, _ args: CVarArg...) {
12181218
let str = withVaList(args) { (vaPtr) -> CFString! in
12191219
CFStringCreateWithFormatAndArguments(kCFAllocatorSystemDefault, nil, format._cfObject, vaPtr)
1220-
}
1220+
}!
12211221
self.init(str._swiftObject)
12221222
}
12231223

‎Foundation/NSTask.swift

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,31 +40,31 @@ private var managerThreadRunLoopIsRunningCondition = NSCondition()
4040
internal let kCFSocketDataCallBack = CFSocketCallBackType.dataCallBack.rawValue
4141
#endif
4242

43-
private func emptyRunLoopCallback(_ context : UnsafeMutablePointer<Void>!) -> Void {}
43+
private func emptyRunLoopCallback(_ context : UnsafeMutablePointer<Void>?) -> Void {}
4444

4545

4646
// Retain method for run loop source
47-
private func runLoopSourceRetain(_ pointer : UnsafePointer<Void>!) -> UnsafePointer<Void>! {
48-
let ref = Unmanaged<AnyObject>.fromOpaque(OpaquePointer(pointer)).takeUnretainedValue()
47+
private func runLoopSourceRetain(_ pointer : UnsafePointer<Void>?) -> UnsafePointer<Void>? {
48+
let ref = Unmanaged<AnyObject>.fromOpaque(OpaquePointer(pointer!)).takeUnretainedValue()
4949
let retained = Unmanaged<AnyObject>.passRetained(ref)
5050
return unsafeBitCast(retained, to: UnsafePointer<Void>.self)
5151
}
5252

5353
// Release method for run loop source
54-
private func runLoopSourceRelease(_ pointer : UnsafePointer<Void>!) -> Void {
55-
Unmanaged<AnyObject>.fromOpaque(OpaquePointer(pointer)).release()
54+
private func runLoopSourceRelease(_ pointer : UnsafePointer<Void>?) -> Void {
55+
Unmanaged<AnyObject>.fromOpaque(OpaquePointer(pointer!)).release()
5656
}
5757

5858
// Equal method for run loop source
5959

60-
private func runloopIsEqual(_ a : UnsafePointer<Void>!, b : UnsafePointer<Void>!) -> _DarwinCompatibleBoolean {
60+
private func runloopIsEqual(_ a : UnsafePointer<Void>?, b : UnsafePointer<Void>?) -> _DarwinCompatibleBoolean {
6161

62-
let unmanagedrunLoopA = Unmanaged<AnyObject>.fromOpaque(OpaquePointer(a))
62+
let unmanagedrunLoopA = Unmanaged<AnyObject>.fromOpaque(OpaquePointer(a!))
6363
guard let runLoopA = unmanagedrunLoopA.takeUnretainedValue() as? NSRunLoop else {
6464
return false
6565
}
6666

67-
let unmanagedRunLoopB = Unmanaged<AnyObject>.fromOpaque(OpaquePointer(a))
67+
let unmanagedRunLoopB = Unmanaged<AnyObject>.fromOpaque(OpaquePointer(a!))
6868
guard let runLoopB = unmanagedRunLoopB.takeUnretainedValue() as? NSRunLoop else {
6969
return false
7070
}
@@ -76,7 +76,7 @@ private func runloopIsEqual(_ a : UnsafePointer<Void>!, b : UnsafePointer<Void>!
7676
return true
7777
}
7878

79-
@noreturn private func managerThread(_ x: UnsafeMutablePointer<Void>!) -> UnsafeMutablePointer<Void>! {
79+
@noreturn private func managerThread(_ x: UnsafeMutablePointer<Void>?) -> UnsafeMutablePointer<Void>? {
8080

8181
managerThreadRunLoop = NSRunLoop.currentRunLoop()
8282
var emptySourceContext = CFRunLoopSourceContext (version: 0, info: UnsafeMutablePointer<Void>(OpaquePointer(bitPattern: Unmanaged.passUnretained(managerThreadRunLoop!))),
@@ -111,14 +111,14 @@ private func managerThreadSetup() -> Void {
111111

112112

113113
// Equal method for task in run loop source
114-
private func nstaskIsEqual(_ a : UnsafePointer<Void>!, b : UnsafePointer<Void>!) -> _DarwinCompatibleBoolean {
114+
private func nstaskIsEqual(_ a : UnsafePointer<Void>?, b : UnsafePointer<Void>?) -> _DarwinCompatibleBoolean {
115115

116-
let unmanagedTaskA = Unmanaged<AnyObject>.fromOpaque(OpaquePointer(a))
116+
let unmanagedTaskA = Unmanaged<AnyObject>.fromOpaque(OpaquePointer(a!))
117117
guard let taskA = unmanagedTaskA.takeUnretainedValue() as? NSTask else {
118118
return false
119119
}
120120

121-
let unmanagedTaskB = Unmanaged<AnyObject>.fromOpaque(OpaquePointer(a))
121+
let unmanagedTaskB = Unmanaged<AnyObject>.fromOpaque(OpaquePointer(a!))
122122
guard let taskB = unmanagedTaskB.takeUnretainedValue() as? NSTask else {
123123
return false
124124
}
@@ -228,7 +228,7 @@ public class NSTask : NSObject {
228228
let socket = CFSocketCreateWithNative( nil, taskSocketPair[0], CFOptionFlags(kCFSocketDataCallBack), {
229229
(socket, type, address, data, info ) in
230230

231-
let task = Unmanaged<NSTask>.fromOpaque(OpaquePointer(info)).takeUnretainedValue()
231+
let task = Unmanaged<NSTask>.fromOpaque(OpaquePointer(info!)).takeUnretainedValue()
232232

233233
task.processLaunchedCondition.lock()
234234
while task.running == false {
@@ -256,7 +256,7 @@ public class NSTask : NSObject {
256256
#endif
257257
pthread_create(&threadID, nil, { (context) -> UnsafeMutablePointer<Void>! in
258258

259-
let unmanagedTask : Unmanaged<NSTask> = Unmanaged.fromOpaque(context)
259+
let unmanagedTask : Unmanaged<NSTask> = Unmanaged.fromOpaque(context!)
260260
let task = unmanagedTask.takeRetainedValue()
261261

262262
task.terminationHandler!( task )

0 commit comments

Comments
 (0)