Skip to content

Commit d1835a1

Browse files
briancroombriancroom
committed
Move @autoclosure and @NoEscape annotations from param names to types
Just keeping up with the (swiftc) times.
1 parent b106a92 commit d1835a1

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎Sources/XCTest/XCTAssert.swift

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ private enum _XCTAssertionResult {
7575
}
7676
}
7777

78-
private func _XCTEvaluateAssertion(_ assertion: _XCTAssertion, @autoclosure message: () -> String = "", file: StaticString = #file, line: UInt = #line, @noescape expression: () throws -> _XCTAssertionResult) {
78+
private func _XCTEvaluateAssertion(_ assertion: _XCTAssertion, message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line, expression: @noescape () throws -> _XCTAssertionResult) {
7979
let result: _XCTAssertionResult
8080
do {
8181
result = try expression()
@@ -152,11 +152,11 @@ private func _XCTEvaluateAssertion(_ assertion: _XCTAssertion, @autoclosure mess
152152
///
153153
/// Now calling failures in `AssertEmpty` will be reported in the file and on
154154
/// the line that the assert function is *called*, not where it is defined.
155-
public func XCTAssert(@autoclosure _ expression: () throws -> Boolean, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
155+
public func XCTAssert(_ expression: @autoclosure () throws -> Boolean, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
156156
XCTAssertTrue(expression, message, file: file, line: line)
157157
}
158158

159-
public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -> T?, @autoclosure _ expression2: () throws -> T?, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
159+
public func XCTAssertEqual<T: Equatable>(_ expression1: @autoclosure () throws -> T?, _ expression2: @autoclosure () throws -> T?, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
160160
_XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {
161161
let (value1, value2) = (try expression1(), try expression2())
162162
if value1 == value2 {
@@ -167,7 +167,7 @@ public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -
167167
}
168168
}
169169

170-
public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -> ArraySlice<T>, @autoclosure _ expression2: () throws -> ArraySlice<T>, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
170+
public func XCTAssertEqual<T: Equatable>(_ expression1: @autoclosure () throws -> ArraySlice<T>, _ expression2: @autoclosure () throws -> ArraySlice<T>, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
171171
_XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {
172172
let (value1, value2) = (try expression1(), try expression2())
173173
if value1 == value2 {
@@ -178,7 +178,7 @@ public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -
178178
}
179179
}
180180

181-
public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -> ContiguousArray<T>, @autoclosure _ expression2: () throws -> ContiguousArray<T>, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
181+
public func XCTAssertEqual<T: Equatable>(_ expression1: @autoclosure () throws -> ContiguousArray<T>, _ expression2: @autoclosure () throws -> ContiguousArray<T>, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
182182
_XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {
183183
let (value1, value2) = (try expression1(), try expression2())
184184
if value1 == value2 {
@@ -189,7 +189,7 @@ public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -
189189
}
190190
}
191191

192-
public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -> [T], @autoclosure _ expression2: () throws -> [T], @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
192+
public func XCTAssertEqual<T: Equatable>(_ expression1: @autoclosure () throws -> [T], _ expression2: @autoclosure () throws -> [T], _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
193193
_XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {
194194
let (value1, value2) = (try expression1(), try expression2())
195195
if value1 == value2 {
@@ -200,7 +200,7 @@ public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -
200200
}
201201
}
202202

203-
public func XCTAssertEqual<T, U: Equatable>(@autoclosure _ expression1: () throws -> [T: U], @autoclosure _ expression2: () throws -> [T: U], @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
203+
public func XCTAssertEqual<T, U: Equatable>(_ expression1: @autoclosure () throws -> [T: U], _ expression2: @autoclosure () throws -> [T: U], _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
204204
_XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {
205205
let (value1, value2) = (try expression1(), try expression2())
206206
if value1 == value2 {
@@ -211,7 +211,7 @@ public func XCTAssertEqual<T, U: Equatable>(@autoclosure _ expression1: () throw
211211
}
212212
}
213213

214-
public func XCTAssertEqualWithAccuracy<T: FloatingPoint>(@autoclosure _ expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, accuracy: T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
214+
public func XCTAssertEqualWithAccuracy<T: FloatingPoint>(_ expression1: @autoclosure () throws -> T, _ expression2: @autoclosure () throws -> T, accuracy: T, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
215215
_XCTEvaluateAssertion(.equalWithAccuracy, message: message, file: file, line: line) {
216216
let (value1, value2) = (try expression1(), try expression2())
217217
if abs(value1.distance(to: value2)) <= abs(accuracy.distance(to: T(0))) {
@@ -222,7 +222,7 @@ public func XCTAssertEqualWithAccuracy<T: FloatingPoint>(@autoclosure _ expressi
222222
}
223223
}
224224

225-
public func XCTAssertFalse(@autoclosure _ expression: () throws -> Boolean, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
225+
public func XCTAssertFalse(_ expression: @autoclosure () throws -> Boolean, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
226226
_XCTEvaluateAssertion(.`false`, message: message, file: file, line: line) {
227227
let value = try expression()
228228
if !value.boolValue {
@@ -233,7 +233,7 @@ public func XCTAssertFalse(@autoclosure _ expression: () throws -> Boolean, @aut
233233
}
234234
}
235235

236-
public func XCTAssertGreaterThan<T: Comparable>(@autoclosure _ expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
236+
public func XCTAssertGreaterThan<T: Comparable>(_ expression1: @autoclosure () throws -> T, _ expression2: @autoclosure () throws -> T, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
237237
_XCTEvaluateAssertion(.greaterThan, message: message, file: file, line: line) {
238238
let (value1, value2) = (try expression1(), try expression2())
239239
if value1 > value2 {
@@ -244,7 +244,7 @@ public func XCTAssertGreaterThan<T: Comparable>(@autoclosure _ expression1: () t
244244
}
245245
}
246246

247-
public func XCTAssertGreaterThanOrEqual<T: Comparable>(@autoclosure _ expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
247+
public func XCTAssertGreaterThanOrEqual<T: Comparable>(_ expression1: @autoclosure () throws -> T, _ expression2: @autoclosure () throws -> T, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
248248
_XCTEvaluateAssertion(.greaterThanOrEqual, message: message, file: file, line: line) {
249249
let (value1, value2) = (try expression1(), try expression2())
250250
if value1 >= value2 {
@@ -255,7 +255,7 @@ public func XCTAssertGreaterThanOrEqual<T: Comparable>(@autoclosure _ expression
255255
}
256256
}
257257

258-
public func XCTAssertLessThan<T: Comparable>(@autoclosure _ expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
258+
public func XCTAssertLessThan<T: Comparable>(_ expression1: @autoclosure () throws -> T, _ expression2: @autoclosure () throws -> T, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
259259
_XCTEvaluateAssertion(.lessThan, message: message, file: file, line: line) {
260260
let (value1, value2) = (try expression1(), try expression2())
261261
if value1 < value2 {
@@ -266,7 +266,7 @@ public func XCTAssertLessThan<T: Comparable>(@autoclosure _ expression1: () thro
266266
}
267267
}
268268

269-
public func XCTAssertLessThanOrEqual<T: Comparable>(@autoclosure _ expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
269+
public func XCTAssertLessThanOrEqual<T: Comparable>(_ expression1: @autoclosure () throws -> T, _ expression2: @autoclosure () throws -> T, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
270270
_XCTEvaluateAssertion(.lessThanOrEqual, message: message, file: file, line: line) {
271271
let (value1, value2) = (try expression1(), try expression2())
272272
if value1 <= value2 {
@@ -277,7 +277,7 @@ public func XCTAssertLessThanOrEqual<T: Comparable>(@autoclosure _ expression1:
277277
}
278278
}
279279

280-
public func XCTAssertNil(@autoclosure _ expression: () throws -> Any?, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
280+
public func XCTAssertNil(_ expression: @autoclosure () throws -> Any?, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
281281
_XCTEvaluateAssertion(.`nil`, message: message, file: file, line: line) {
282282
let value = try expression()
283283
if value == nil {
@@ -288,7 +288,7 @@ public func XCTAssertNil(@autoclosure _ expression: () throws -> Any?, @autoclos
288288
}
289289
}
290290

291-
public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throws -> T?, @autoclosure _ expression2: () throws -> T?, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
291+
public func XCTAssertNotEqual<T: Equatable>(_ expression1: @autoclosure () throws -> T?, _ expression2: @autoclosure () throws -> T?, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
292292
_XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {
293293
let (value1, value2) = (try expression1(), try expression2())
294294
if value1 != value2 {
@@ -299,7 +299,7 @@ public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throw
299299
}
300300
}
301301

302-
public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throws -> ContiguousArray<T>, @autoclosure _ expression2: () throws -> ContiguousArray<T>, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
302+
public func XCTAssertNotEqual<T: Equatable>(_ expression1: @autoclosure () throws -> ContiguousArray<T>, _ expression2: @autoclosure () throws -> ContiguousArray<T>, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
303303
_XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {
304304
let (value1, value2) = (try expression1(), try expression2())
305305
if value1 != value2 {
@@ -310,7 +310,7 @@ public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throw
310310
}
311311
}
312312

313-
public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throws -> ArraySlice<T>, @autoclosure _ expression2: () throws -> ArraySlice<T>, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
313+
public func XCTAssertNotEqual<T: Equatable>(_ expression1: @autoclosure () throws -> ArraySlice<T>, _ expression2: @autoclosure () throws -> ArraySlice<T>, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
314314
_XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {
315315
let (value1, value2) = (try expression1(), try expression2())
316316
if value1 != value2 {
@@ -321,7 +321,7 @@ public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throw
321321
}
322322
}
323323

324-
public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throws -> [T], @autoclosure _ expression2: () throws -> [T], @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
324+
public func XCTAssertNotEqual<T: Equatable>(_ expression1: @autoclosure () throws -> [T], _ expression2: @autoclosure () throws -> [T], _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
325325
_XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {
326326
let (value1, value2) = (try expression1(), try expression2())
327327
if value1 != value2 {
@@ -332,7 +332,7 @@ public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throw
332332
}
333333
}
334334

335-
public func XCTAssertNotEqual<T, U: Equatable>(@autoclosure _ expression1: () throws -> [T: U], @autoclosure _ expression2: () throws -> [T: U], @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
335+
public func XCTAssertNotEqual<T, U: Equatable>(_ expression1: @autoclosure () throws -> [T: U], _ expression2: @autoclosure () throws -> [T: U], _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
336336
_XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {
337337
let (value1, value2) = (try expression1(), try expression2())
338338
if value1 != value2 {
@@ -343,7 +343,7 @@ public func XCTAssertNotEqual<T, U: Equatable>(@autoclosure _ expression1: () th
343343
}
344344
}
345345

346-
public func XCTAssertNotEqualWithAccuracy<T: FloatingPoint>(@autoclosure _ expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, _ accuracy: T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
346+
public func XCTAssertNotEqualWithAccuracy<T: FloatingPoint>(_ expression1: @autoclosure () throws -> T, _ expression2: @autoclosure () throws -> T, _ accuracy: T, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
347347
_XCTEvaluateAssertion(.notEqualWithAccuracy, message: message, file: file, line: line) {
348348
let (value1, value2) = (try expression1(), try expression2())
349349
if abs(value1.distance(to: value2)) > abs(accuracy.distance(to: T(0))) {
@@ -354,7 +354,7 @@ public func XCTAssertNotEqualWithAccuracy<T: FloatingPoint>(@autoclosure _ expre
354354
}
355355
}
356356

357-
public func XCTAssertNotNil(@autoclosure _ expression: () throws -> Any?, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
357+
public func XCTAssertNotNil(_ expression: @autoclosure () throws -> Any?, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
358358
_XCTEvaluateAssertion(.notNil, message: message, file: file, line: line) {
359359
let value = try expression()
360360
if value != nil {
@@ -365,7 +365,7 @@ public func XCTAssertNotNil(@autoclosure _ expression: () throws -> Any?, @autoc
365365
}
366366
}
367367

368-
public func XCTAssertTrue(@autoclosure _ expression: () throws -> Boolean, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
368+
public func XCTAssertTrue(_ expression: @autoclosure () throws -> Boolean, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
369369
_XCTEvaluateAssertion(.`true`, message: message, file: file, line: line) {
370370
let value = try expression()
371371
if value.boolValue {
@@ -382,7 +382,7 @@ public func XCTFail(_ message: String = "", file: StaticString = #file, line: UI
382382
}
383383
}
384384

385-
public func XCTAssertThrowsError<T>(@autoclosure _ expression: () throws -> T, _ message: String = "", file: StaticString = #file, line: UInt = #line, _ errorHandler: (error: ErrorProtocol) -> Void = { _ in }) {
385+
public func XCTAssertThrowsError<T>(_ expression: @autoclosure () throws -> T, _ message: String = "", file: StaticString = #file, line: UInt = #line, _ errorHandler: (error: ErrorProtocol) -> Void = { _ in }) {
386386
_XCTEvaluateAssertion(.throwsError, message: message, file: file, line: line) {
387387
var caughtErrorOptional: ErrorProtocol?
388388
do {

‎Sources/XCTest/XCTestObservationCenter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public class XCTestObservationCenter {
7171
forEachObserver { $0.testBundleDidFinish(testBundle) }
7272
}
7373

74-
private func forEachObserver(@noescape _ body: XCTestObservation -> Void) {
74+
private func forEachObserver(_ body: @noescape XCTestObservation -> Void) {
7575
for observer in observers {
7676
body(observer.object)
7777
}

0 commit comments

Comments
 (0)