Skip to content

Commit 8a5c3d8

Browse files
swift-ciswift-ci
authored
Merge pull request #1627 from otaviolima/do-catch-refactor
2 parents fa8a1c2 + 019cab0 commit 8a5c3d8

17 files changed

+108
-166
lines changed

‎Foundation/FileManager.swift

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -979,11 +979,7 @@ open class FileManager : NSObject {
979979
/* These methods are provided here for compatibility. The corresponding methods on NSData which return NSErrors should be regarded as the primary method of creating a file from an NSData or retrieving the contents of a file as an NSData.
980980
*/
981981
open func contents(atPath path: String) -> Data? {
982-
do {
983-
return try Data(contentsOf: URL(fileURLWithPath: path))
984-
} catch {
985-
return nil
986-
}
982+
return try? Data(contentsOf: URL(fileURLWithPath: path))
987983
}
988984

989985
open func createFile(atPath path: String, contents data: Data?, attributes attr: [FileAttributeKey : Any]? = nil) -> Bool {
@@ -993,7 +989,7 @@ open class FileManager : NSObject {
993989
try self.setAttributes(attr, ofItemAtPath: path)
994990
}
995991
return true
996-
} catch _ {
992+
} catch {
997993
return false
998994
}
999995
}

‎Foundation/NSData.swift

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -579,22 +579,18 @@ open class NSData : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
579579
if fsync(fd) < 0 {
580580
throw _NSErrorWithErrno(errno, reading: false, path: path)
581581
}
582-
} catch let err {
582+
} catch {
583583
if let auxFilePath = auxFilePath {
584-
do {
585-
try FileManager.default.removeItem(atPath: auxFilePath)
586-
} catch _ {}
584+
try? FileManager.default.removeItem(atPath: auxFilePath)
587585
}
588-
throw err
586+
throw error
589587
}
590588
}
591589
}
592590
if let auxFilePath = auxFilePath {
593591
try fm._fileSystemRepresentation(withPath: auxFilePath, { auxFilePathFsRep in
594592
if rename(auxFilePathFsRep, pathFsRep) != 0 {
595-
do {
596-
try FileManager.default.removeItem(atPath: auxFilePath)
597-
} catch _ {}
593+
try? FileManager.default.removeItem(atPath: auxFilePath)
598594
throw _NSErrorWithErrno(errno, reading: false, path: path)
599595
}
600596
if let mode = mode {
@@ -705,8 +701,8 @@ open class NSData : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
705701
self.enumerateBytes() { (buf, range, stop) -> Void in
706702
do {
707703
try block(buf, range, stop)
708-
} catch let e {
709-
err = e
704+
} catch {
705+
err = error
710706
}
711707
}
712708
if let err = err {

‎Foundation/NSKeyedArchiver.swift

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,18 +138,15 @@ open class NSKeyedArchiver : NSCoder {
138138

139139
do {
140140
(fd, auxFilePath) = try _NSCreateTemporaryFile(path)
141-
} catch _ {
141+
} catch {
142142
return false
143143
}
144144

145145
defer {
146-
do {
147-
if finishedEncoding {
148-
try _NSCleanupTemporaryFile(auxFilePath, path)
149-
} else {
150-
try FileManager.default.removeItem(atPath: auxFilePath)
151-
}
152-
} catch _ {
146+
if finishedEncoding {
147+
try? _NSCleanupTemporaryFile(auxFilePath, path)
148+
} else {
149+
try? FileManager.default.removeItem(atPath: auxFilePath)
153150
}
154151
}
155152

‎Foundation/NSKeyedUnarchiver.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,7 @@ open class NSKeyedUnarchiver : NSCoder {
5858
}
5959

6060
open class func unarchiveObject(with data: Data) -> Any? {
61-
do {
62-
return try unarchiveTopLevelObjectWithData(data)
63-
} catch {
64-
}
65-
return nil
61+
return try? unarchiveTopLevelObjectWithData(data)
6662
}
6763

6864
open class func unarchiveObject(withFile path: String) -> Any? {

‎Foundation/NSString.swift

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,13 @@ internal func _createRegexForPattern(_ pattern: String, _ options: NSRegularExpr
122122
if let regex = local.__NSRegularExpressionCache.object(forKey: key._nsObject) {
123123
return regex
124124
}
125-
do {
126-
let regex = try NSRegularExpression(pattern: pattern, options: options)
127-
local.__NSRegularExpressionCache.setObject(regex, forKey: key._nsObject)
128-
return regex
129-
} catch {
130-
125+
126+
guard let regex = try? NSRegularExpression(pattern: pattern, options: options) else {
127+
return nil
131128
}
132-
133-
return nil
129+
130+
local.__NSRegularExpressionCache.setObject(regex, forKey: key._nsObject)
131+
return regex
134132
}
135133

136134
internal func _bytesInEncoding(_ str: NSString, _ encoding: String.Encoding, _ fatalOnError: Bool, _ externalRep: Bool, _ lossy: Bool) -> UnsafePointer<Int8>? {

‎TestFoundation/TestBundle.swift

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class BundlePlayground {
133133
}
134134

135135
self.bundlePath = bundleURL.path
136-
} catch _ {
136+
} catch {
137137
return false
138138
}
139139

@@ -176,7 +176,7 @@ class BundlePlayground {
176176
}
177177

178178
self.bundlePath = resourcesDirectory.path
179-
} catch _ {
179+
} catch {
180180
return false
181181
}
182182

@@ -210,7 +210,7 @@ class BundlePlayground {
210210
}
211211

212212
self.bundlePath = resourcesDirectory.path
213-
} catch _ {
213+
} catch {
214214
return false
215215
}
216216
}
@@ -222,12 +222,8 @@ class BundlePlayground {
222222
func destroy() {
223223
guard let path = self.playgroundPath else { return }
224224
self.playgroundPath = nil
225-
226-
do {
227-
try FileManager.default.removeItem(atPath: path)
228-
} catch _ {
229-
// ¯\_(ツ)_/¯ We did what we could.
230-
}
225+
226+
try? FileManager.default.removeItem(atPath: path)
231227
}
232228

233229
deinit {
@@ -363,11 +359,7 @@ class TestBundle : XCTestCase {
363359
}
364360

365361
private func _cleanupPlayground(_ location: String) {
366-
do {
367-
try FileManager.default.removeItem(atPath: location)
368-
} catch _ {
369-
// Oh well
370-
}
362+
try? FileManager.default.removeItem(atPath: location)
371363
}
372364

373365
func test_URLsForResourcesWithExtension() {

‎TestFoundation/TestCodable.swift

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class TestCodable : XCTestCase {
8484
for components in personNameComponentsValues {
8585
do {
8686
try expectRoundTripEqualityThroughJSON(for: components)
87-
} catch let error {
87+
} catch {
8888
XCTFail("\(error) for \(components)")
8989
}
9090
}
@@ -103,7 +103,7 @@ class TestCodable : XCTestCase {
103103
// We have to wrap the UUID since we cannot have a top-level string.
104104
do {
105105
try expectRoundTripEqualityThroughJSON(for: UUIDCodingWrapper(uuid))
106-
} catch let error {
106+
} catch {
107107
XCTFail("\(error) for \(uuid)")
108108
}
109109
}
@@ -122,7 +122,7 @@ class TestCodable : XCTestCase {
122122
for url in urlValues {
123123
do {
124124
try expectRoundTripEqualityThroughJSON(for: url)
125-
} catch let error {
125+
} catch {
126126
XCTFail("\(error) for \(url)")
127127
}
128128
}
@@ -139,7 +139,7 @@ class TestCodable : XCTestCase {
139139
for range in nsrangeValues {
140140
do {
141141
try expectRoundTripEqualityThroughJSON(for: range)
142-
} catch let error {
142+
} catch {
143143
XCTFail("\(error) for \(range)")
144144
}
145145
}
@@ -161,7 +161,7 @@ class TestCodable : XCTestCase {
161161
for locale in localeValues {
162162
do {
163163
try expectRoundTripEqualityThroughJSON(for: locale)
164-
} catch let error {
164+
} catch {
165165
XCTFail("\(error) for \(locale)")
166166
}
167167
}
@@ -178,7 +178,7 @@ class TestCodable : XCTestCase {
178178
for indexSet in indexSetValues {
179179
do {
180180
try expectRoundTripEqualityThroughJSON(for: indexSet)
181-
} catch let error {
181+
} catch {
182182
XCTFail("\(error) for \(indexSet)")
183183
}
184184
}
@@ -196,7 +196,7 @@ class TestCodable : XCTestCase {
196196
for indexPath in indexPathValues {
197197
do {
198198
try expectRoundTripEqualityThroughJSON(for: indexPath)
199-
} catch let error {
199+
} catch {
200200
XCTFail("\(error) for \(indexPath)")
201201
}
202202
}
@@ -224,7 +224,7 @@ class TestCodable : XCTestCase {
224224
for transform in affineTransformValues {
225225
do {
226226
try expectRoundTripEqualityThroughJSON(for: transform)
227-
} catch let error {
227+
} catch {
228228
XCTFail("\(error) for \(transform)")
229229
}
230230
}
@@ -244,7 +244,7 @@ class TestCodable : XCTestCase {
244244
for decimal in decimalValues {
245245
do {
246246
try expectRoundTripEqualityThroughJSON(for: decimal)
247-
} catch let error {
247+
} catch {
248248
XCTFail("\(error) for \(decimal)")
249249
}
250250
}
@@ -264,7 +264,7 @@ class TestCodable : XCTestCase {
264264
for point in cgpointValues {
265265
do {
266266
try expectRoundTripEqualityThroughJSON(for: point)
267-
} catch let error {
267+
} catch {
268268
XCTFail("\(error) for \(point)")
269269
}
270270
}
@@ -284,7 +284,7 @@ class TestCodable : XCTestCase {
284284
for size in cgsizeValues {
285285
do {
286286
try expectRoundTripEqualityThroughJSON(for: size)
287-
} catch let error {
287+
} catch {
288288
XCTFail("\(error) for \(size)")
289289
}
290290
}
@@ -305,7 +305,7 @@ class TestCodable : XCTestCase {
305305
for rect in cgrectValues {
306306
do {
307307
try expectRoundTripEqualityThroughJSON(for: rect)
308-
} catch let error {
308+
} catch {
309309
XCTFail("\(error) for \(rect)")
310310
}
311311
}
@@ -335,7 +335,7 @@ class TestCodable : XCTestCase {
335335
for characterSet in characterSetValues {
336336
do {
337337
try expectRoundTripEqualityThroughJSON(for: characterSet)
338-
} catch let error {
338+
} catch {
339339
XCTFail("\(error) for \(characterSet)")
340340
}
341341
}
@@ -366,7 +366,7 @@ class TestCodable : XCTestCase {
366366
for timeZone in timeZoneValues {
367367
do {
368368
try expectRoundTripEqualityThroughJSON(for: timeZone)
369-
} catch let error {
369+
} catch {
370370
XCTFail("\(error) for \(timeZone)")
371371
}
372372
}
@@ -404,7 +404,7 @@ class TestCodable : XCTestCase {
404404
for calendar in calendarValues {
405405
do {
406406
try expectRoundTripEqualityThroughJSON(for: calendar)
407-
} catch let error {
407+
} catch {
408408
XCTFail("\(error) for \(calendar)")
409409
}
410410
}
@@ -441,7 +441,7 @@ class TestCodable : XCTestCase {
441441
let components = calendar.dateComponents(dateComponents, from: Date(timeIntervalSince1970: 1501283776))
442442
do {
443443
try expectRoundTripEqualityThroughJSON(for: components)
444-
} catch let error {
444+
} catch {
445445
XCTFail("\(error)")
446446
}
447447
}
@@ -452,7 +452,7 @@ class TestCodable : XCTestCase {
452452
try expectRoundTripEqualityThroughJSON(for: Measurement(value: 42, unit: UnitAcceleration.metersPerSecondSquared))
453453
try expectRoundTripEqualityThroughJSON(for: Measurement(value: 42, unit: UnitMass.kilograms))
454454
try expectRoundTripEqualityThroughJSON(for: Measurement(value: 42, unit: UnitLength.miles))
455-
} catch let error {
455+
} catch {
456456
XCTFail("\(error)")
457457
}
458458
}
@@ -548,7 +548,7 @@ class TestCodable : XCTestCase {
548548
for (components) in urlComponentsValues {
549549
do {
550550
try expectRoundTripEqualityThroughJSON(for: components)
551-
} catch let error {
551+
} catch {
552552
XCTFail("\(error)")
553553
}
554554
}

0 commit comments

Comments
 (0)