Merge pull request #99 from briancroom/noescape-autoclosure-type-attributes

modocache · modocache · commit efdde9849c76 · 2016-04-24T09:16:03.000-04:00
Move @autoclosure and @NoEscape annotations from param names to types
diff --git a/Sources/XCTest/XCTAssert.swift b/Sources/XCTest/XCTAssert.swift
@@ -75,7 +75,7 @@ private enum _XCTAssertionResult {
     }
 }
 
-private func _XCTEvaluateAssertion(_ assertion: _XCTAssertion, @autoclosure message: () -> String = "", file: StaticString = #file, line: UInt = #line, @noescape expression: () throws -> _XCTAssertionResult) {
+private func _XCTEvaluateAssertion(_ assertion: _XCTAssertion, message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line, expression: @noescape () throws -> _XCTAssertionResult) {
     let result: _XCTAssertionResult
     do {
         result = try expression()
@@ -152,11 +152,11 @@ private func _XCTEvaluateAssertion(_ assertion: _XCTAssertion, @autoclosure mess
 ///
 ///  Now calling failures in `AssertEmpty` will be reported in the file and on
 ///  the line that the assert function is *called*, not where it is defined.
-public func XCTAssert(@autoclosure _ expression: () throws -> Boolean, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssert(_ expression: @autoclosure () throws -> Boolean, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     XCTAssertTrue(expression, message, file: file, line: line)
 }
 
-public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -> T?, @autoclosure _ expression2: () throws -> T?, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertEqual<T: Equatable>(_ expression1: @autoclosure () throws -> T?, _ expression2: @autoclosure () throws -> T?, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     _XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {
         let (value1, value2) = (try expression1(), try expression2())
         if value1 == value2 {
@@ -167,7 +167,7 @@ public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -
     }
 }
 
-public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -> ArraySlice<T>, @autoclosure _ expression2: () throws -> ArraySlice<T>, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertEqual<T: Equatable>(_ expression1: @autoclosure () throws -> ArraySlice<T>, _ expression2: @autoclosure () throws -> ArraySlice<T>, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     _XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {
         let (value1, value2) = (try expression1(), try expression2())
         if value1 == value2 {
@@ -178,7 +178,7 @@ public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -
     }
 }
 
-public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -> ContiguousArray<T>, @autoclosure _ expression2: () throws -> ContiguousArray<T>, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertEqual<T: Equatable>(_ expression1: @autoclosure () throws -> ContiguousArray<T>, _ expression2: @autoclosure () throws -> ContiguousArray<T>, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     _XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {
         let (value1, value2) = (try expression1(), try expression2())
         if value1 == value2 {
@@ -189,7 +189,7 @@ public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -
     }
 }
 
-public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -> [T], @autoclosure _ expression2: () throws -> [T], @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertEqual<T: Equatable>(_ expression1: @autoclosure () throws -> [T], _ expression2: @autoclosure () throws -> [T], _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     _XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {
         let (value1, value2) = (try expression1(), try expression2())
         if value1 == value2 {
@@ -200,7 +200,7 @@ public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -
     }
 }
 
-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) {
+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) {
     _XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {
         let (value1, value2) = (try expression1(), try expression2())
         if value1 == value2 {
@@ -211,7 +211,7 @@ public func XCTAssertEqual<T, U: Equatable>(@autoclosure _ expression1: () throw
     }
 }
 
-public func XCTAssertEqualWithAccuracy<T: FloatingPoint>(@autoclosure _ expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, accuracy: T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertEqualWithAccuracy<T: FloatingPoint>(_ expression1: @autoclosure () throws -> T, _ expression2: @autoclosure () throws -> T, accuracy: T, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     _XCTEvaluateAssertion(.equalWithAccuracy, message: message, file: file, line: line) {
         let (value1, value2) = (try expression1(), try expression2())
         if abs(value1.distance(to: value2)) <= abs(accuracy.distance(to: T(0))) {
@@ -222,7 +222,7 @@ public func XCTAssertEqualWithAccuracy<T: FloatingPoint>(@autoclosure _ expressi
     }
 }
 
-public func XCTAssertFalse(@autoclosure _ expression: () throws -> Boolean, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertFalse(_ expression: @autoclosure () throws -> Boolean, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     _XCTEvaluateAssertion(.`false`, message: message, file: file, line: line) {
         let value = try expression()
         if !value.boolValue {
@@ -233,7 +233,7 @@ public func XCTAssertFalse(@autoclosure _ expression: () throws -> Boolean, @aut
     }
 }
 
-public func XCTAssertGreaterThan<T: Comparable>(@autoclosure _ expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertGreaterThan<T: Comparable>(_ expression1: @autoclosure () throws -> T, _ expression2: @autoclosure () throws -> T, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     _XCTEvaluateAssertion(.greaterThan, message: message, file: file, line: line) {
         let (value1, value2) = (try expression1(), try expression2())
         if value1 > value2 {
@@ -244,7 +244,7 @@ public func XCTAssertGreaterThan<T: Comparable>(@autoclosure _ expression1: () t
     }
 }
 
-public func XCTAssertGreaterThanOrEqual<T: Comparable>(@autoclosure _ expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertGreaterThanOrEqual<T: Comparable>(_ expression1: @autoclosure () throws -> T, _ expression2: @autoclosure () throws -> T, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     _XCTEvaluateAssertion(.greaterThanOrEqual, message: message, file: file, line: line) {
         let (value1, value2) = (try expression1(), try expression2())
         if value1 >= value2 {
@@ -255,7 +255,7 @@ public func XCTAssertGreaterThanOrEqual<T: Comparable>(@autoclosure _ expression
     }
 }
 
-public func XCTAssertLessThan<T: Comparable>(@autoclosure _ expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertLessThan<T: Comparable>(_ expression1: @autoclosure () throws -> T, _ expression2: @autoclosure () throws -> T, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     _XCTEvaluateAssertion(.lessThan, message: message, file: file, line: line) {
         let (value1, value2) = (try expression1(), try expression2())
         if value1 < value2 {
@@ -266,7 +266,7 @@ public func XCTAssertLessThan<T: Comparable>(@autoclosure _ expression1: () thro
     }
 }
 
-public func XCTAssertLessThanOrEqual<T: Comparable>(@autoclosure _ expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertLessThanOrEqual<T: Comparable>(_ expression1: @autoclosure () throws -> T, _ expression2: @autoclosure () throws -> T, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     _XCTEvaluateAssertion(.lessThanOrEqual, message: message, file: file, line: line) {
         let (value1, value2) = (try expression1(), try expression2())
         if value1 <= value2 {
@@ -277,7 +277,7 @@ public func XCTAssertLessThanOrEqual<T: Comparable>(@autoclosure _ expression1:
     }
 }
 
-public func XCTAssertNil(@autoclosure _ expression: () throws -> Any?, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertNil(_ expression: @autoclosure () throws -> Any?, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     _XCTEvaluateAssertion(.`nil`, message: message, file: file, line: line) {
         let value = try expression()
         if value == nil {
@@ -288,7 +288,7 @@ public func XCTAssertNil(@autoclosure _ expression: () throws -> Any?, @autoclos
     }
 }
 
-public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throws -> T?, @autoclosure _ expression2: () throws -> T?, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertNotEqual<T: Equatable>(_ expression1: @autoclosure () throws -> T?, _ expression2: @autoclosure () throws -> T?, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     _XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {
         let (value1, value2) = (try expression1(), try expression2())
         if value1 != value2 {
@@ -299,7 +299,7 @@ public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throw
     }
 }
 
-public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throws -> ContiguousArray<T>, @autoclosure _ expression2: () throws -> ContiguousArray<T>, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertNotEqual<T: Equatable>(_ expression1: @autoclosure () throws -> ContiguousArray<T>, _ expression2: @autoclosure () throws -> ContiguousArray<T>, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     _XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {
         let (value1, value2) = (try expression1(), try expression2())
         if value1 != value2 {
@@ -310,7 +310,7 @@ public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throw
     }
 }
 
-public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throws -> ArraySlice<T>, @autoclosure _ expression2: () throws -> ArraySlice<T>, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertNotEqual<T: Equatable>(_ expression1: @autoclosure () throws -> ArraySlice<T>, _ expression2: @autoclosure () throws -> ArraySlice<T>, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     _XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {
         let (value1, value2) = (try expression1(), try expression2())
         if value1 != value2 {
@@ -321,7 +321,7 @@ public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throw
     }
 }
 
-public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throws -> [T], @autoclosure _ expression2: () throws -> [T], @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertNotEqual<T: Equatable>(_ expression1: @autoclosure () throws -> [T], _ expression2: @autoclosure () throws -> [T], _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     _XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {
         let (value1, value2) = (try expression1(), try expression2())
         if value1 != value2 {
@@ -332,7 +332,7 @@ public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throw
     }
 }
 
-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) {
+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) {
     _XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {
         let (value1, value2) = (try expression1(), try expression2())
         if value1 != value2 {
@@ -343,7 +343,7 @@ public func XCTAssertNotEqual<T, U: Equatable>(@autoclosure _ expression1: () th
     }
 }
 
-public func XCTAssertNotEqualWithAccuracy<T: FloatingPoint>(@autoclosure _ expression1: () throws -> T, @autoclosure _ expression2: () throws -> T, _ accuracy: T, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertNotEqualWithAccuracy<T: FloatingPoint>(_ expression1: @autoclosure () throws -> T, _ expression2: @autoclosure () throws -> T, _ accuracy: T, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     _XCTEvaluateAssertion(.notEqualWithAccuracy, message: message, file: file, line: line) {
         let (value1, value2) = (try expression1(), try expression2())
         if abs(value1.distance(to: value2)) > abs(accuracy.distance(to: T(0))) {
@@ -354,7 +354,7 @@ public func XCTAssertNotEqualWithAccuracy<T: FloatingPoint>(@autoclosure _ expre
     }
 }
 
-public func XCTAssertNotNil(@autoclosure _ expression: () throws -> Any?, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertNotNil(_ expression: @autoclosure () throws -> Any?, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     _XCTEvaluateAssertion(.notNil, message: message, file: file, line: line) {
         let value = try expression()
         if value != nil {
@@ -365,7 +365,7 @@ public func XCTAssertNotNil(@autoclosure _ expression: () throws -> Any?, @autoc
     }
 }
 
-public func XCTAssertTrue(@autoclosure _ expression: () throws -> Boolean, @autoclosure _ message: () -> String = "", file: StaticString = #file, line: UInt = #line) {
+public func XCTAssertTrue(_ expression: @autoclosure () throws -> Boolean, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) {
     _XCTEvaluateAssertion(.`true`, message: message, file: file, line: line) {
         let value = try expression()
         if value.boolValue {
@@ -382,7 +382,7 @@ public func XCTFail(_ message: String = "", file: StaticString = #file, line: UI
     }
 }
 
-public func XCTAssertThrowsError<T>(@autoclosure _ expression: () throws -> T, _ message: String = "", file: StaticString = #file, line: UInt = #line, _ errorHandler: (error: ErrorProtocol) -> Void = { _ in }) {
+public func XCTAssertThrowsError<T>(_ expression: @autoclosure () throws -> T, _ message: String = "", file: StaticString = #file, line: UInt = #line, _ errorHandler: (error: ErrorProtocol) -> Void = { _ in }) {
     _XCTEvaluateAssertion(.throwsError, message: message, file: file, line: line) {
         var caughtErrorOptional: ErrorProtocol?
         do {
diff --git a/Sources/XCTest/XCTestObservationCenter.swift b/Sources/XCTest/XCTestObservationCenter.swift
@@ -71,7 +71,7 @@ public class XCTestObservationCenter {
         forEachObserver { $0.testBundleDidFinish(testBundle) }
     }
 
-    private func forEachObserver(@noescape _ body: XCTestObservation -> Void) {
+    private func forEachObserver(_ body: @noescape XCTestObservation -> Void) {
         for observer in observers {
             body(observer.object)
         }

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ private enum _XCTAssertionResult {`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`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) {`
`79`	`79`	`let result: _XCTAssertionResult`
`80`	`80`	`do {`
`81`	`81`	`result = try expression()`
`@@ -152,11 +152,11 @@ private func _XCTEvaluateAssertion(_ assertion: _XCTAssertion, @autoclosure mess`
`152`	`152`	`///`
`153`	`153`	/// Now calling failures in `AssertEmpty` will be reported in the file and on
`154`	`154`	`/// 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) {`
`156`	`156`	`XCTAssertTrue(expression, message, file: file, line: line)`
`157`	`157`	`}`
`158`	`158`
`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) {`
`160`	`160`	`_XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {`
`161`	`161`	`let (value1, value2) = (try expression1(), try expression2())`
`162`	`162`	`if value1 == value2 {`
`@@ -167,7 +167,7 @@ public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`
`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) {`
`171`	`171`	`_XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {`
`172`	`172`	`let (value1, value2) = (try expression1(), try expression2())`
`173`	`173`	`if value1 == value2 {`
`@@ -178,7 +178,7 @@ public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`
`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) {`
`182`	`182`	`_XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {`
`183`	`183`	`let (value1, value2) = (try expression1(), try expression2())`
`184`	`184`	`if value1 == value2 {`
`@@ -189,7 +189,7 @@ public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`
`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) {`
`193`	`193`	`_XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {`
`194`	`194`	`let (value1, value2) = (try expression1(), try expression2())`
`195`	`195`	`if value1 == value2 {`
`@@ -200,7 +200,7 @@ public func XCTAssertEqual<T: Equatable>(@autoclosure _ expression1: () throws -`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`
`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) {`
`204`	`204`	`_XCTEvaluateAssertion(.equal, message: message, file: file, line: line) {`
`205`	`205`	`let (value1, value2) = (try expression1(), try expression2())`
`206`	`206`	`if value1 == value2 {`
`@@ -211,7 +211,7 @@ public func XCTAssertEqual<T, U: Equatable>(@autoclosure _ expression1: () throw`
`211`	`211`	`}`
`212`	`212`	`}`
`213`	`213`
`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) {`
`215`	`215`	`_XCTEvaluateAssertion(.equalWithAccuracy, message: message, file: file, line: line) {`
`216`	`216`	`let (value1, value2) = (try expression1(), try expression2())`
`217`	`217`	`if abs(value1.distance(to: value2)) <= abs(accuracy.distance(to: T(0))) {`
`@@ -222,7 +222,7 @@ public func XCTAssertEqualWithAccuracy<T: FloatingPoint>(@autoclosure _ expressi`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`
`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) {`
`226`	`226`	_XCTEvaluateAssertion(.`false`, message: message, file: file, line: line) {
`227`	`227`	`let value = try expression()`
`228`	`228`	`if !value.boolValue {`
`@@ -233,7 +233,7 @@ public func XCTAssertFalse(@autoclosure _ expression: () throws -> Boolean, @aut`
`233`	`233`	`}`
`234`	`234`	`}`
`235`	`235`
`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) {`
`237`	`237`	`_XCTEvaluateAssertion(.greaterThan, message: message, file: file, line: line) {`
`238`	`238`	`let (value1, value2) = (try expression1(), try expression2())`
`239`	`239`	`if value1 > value2 {`
`@@ -244,7 +244,7 @@ public func XCTAssertGreaterThan<T: Comparable>(@autoclosure _ expression1: () t`
`244`	`244`	`}`
`245`	`245`	`}`
`246`	`246`
`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) {`
`248`	`248`	`_XCTEvaluateAssertion(.greaterThanOrEqual, message: message, file: file, line: line) {`
`249`	`249`	`let (value1, value2) = (try expression1(), try expression2())`
`250`	`250`	`if value1 >= value2 {`
`@@ -255,7 +255,7 @@ public func XCTAssertGreaterThanOrEqual<T: Comparable>(@autoclosure _ expression`
`255`	`255`	`}`
`256`	`256`	`}`
`257`	`257`
`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) {`
`259`	`259`	`_XCTEvaluateAssertion(.lessThan, message: message, file: file, line: line) {`
`260`	`260`	`let (value1, value2) = (try expression1(), try expression2())`
`261`	`261`	`if value1 < value2 {`
`@@ -266,7 +266,7 @@ public func XCTAssertLessThan<T: Comparable>(@autoclosure _ expression1: () thro`
`266`	`266`	`}`
`267`	`267`	`}`
`268`	`268`
`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) {`
`270`	`270`	`_XCTEvaluateAssertion(.lessThanOrEqual, message: message, file: file, line: line) {`
`271`	`271`	`let (value1, value2) = (try expression1(), try expression2())`
`272`	`272`	`if value1 <= value2 {`
`@@ -277,7 +277,7 @@ public func XCTAssertLessThanOrEqual<T: Comparable>(@autoclosure _ expression1:`
`277`	`277`	`}`
`278`	`278`	`}`
`279`	`279`
`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) {`
`281`	`281`	_XCTEvaluateAssertion(.`nil`, message: message, file: file, line: line) {
`282`	`282`	`let value = try expression()`
`283`	`283`	`if value == nil {`
`@@ -288,7 +288,7 @@ public func XCTAssertNil(@autoclosure _ expression: () throws -> Any?, @autoclos`
`288`	`288`	`}`
`289`	`289`	`}`
`290`	`290`
`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) {`
`292`	`292`	`_XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {`
`293`	`293`	`let (value1, value2) = (try expression1(), try expression2())`
`294`	`294`	`if value1 != value2 {`
`@@ -299,7 +299,7 @@ public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throw`
`299`	`299`	`}`
`300`	`300`	`}`
`301`	`301`
`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) {`
`303`	`303`	`_XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {`
`304`	`304`	`let (value1, value2) = (try expression1(), try expression2())`
`305`	`305`	`if value1 != value2 {`
`@@ -310,7 +310,7 @@ public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throw`
`310`	`310`	`}`
`311`	`311`	`}`
`312`	`312`
`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) {`
`314`	`314`	`_XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {`
`315`	`315`	`let (value1, value2) = (try expression1(), try expression2())`
`316`	`316`	`if value1 != value2 {`
`@@ -321,7 +321,7 @@ public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throw`
`321`	`321`	`}`
`322`	`322`	`}`
`323`	`323`
`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) {`
`325`	`325`	`_XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {`
`326`	`326`	`let (value1, value2) = (try expression1(), try expression2())`
`327`	`327`	`if value1 != value2 {`
`@@ -332,7 +332,7 @@ public func XCTAssertNotEqual<T: Equatable>(@autoclosure _ expression1: () throw`
`332`	`332`	`}`
`333`	`333`	`}`
`334`	`334`
`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) {`
`336`	`336`	`_XCTEvaluateAssertion(.notEqual, message: message, file: file, line: line) {`
`337`	`337`	`let (value1, value2) = (try expression1(), try expression2())`
`338`	`338`	`if value1 != value2 {`
`@@ -343,7 +343,7 @@ public func XCTAssertNotEqual<T, U: Equatable>(@autoclosure _ expression1: () th`
`343`	`343`	`}`
`344`	`344`	`}`
`345`	`345`
`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) {`
`347`	`347`	`_XCTEvaluateAssertion(.notEqualWithAccuracy, message: message, file: file, line: line) {`
`348`	`348`	`let (value1, value2) = (try expression1(), try expression2())`
`349`	`349`	`if abs(value1.distance(to: value2)) > abs(accuracy.distance(to: T(0))) {`
`@@ -354,7 +354,7 @@ public func XCTAssertNotEqualWithAccuracy<T: FloatingPoint>(@autoclosure _ expre`
`354`	`354`	`}`
`355`	`355`	`}`
`356`	`356`
`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) {`
`358`	`358`	`_XCTEvaluateAssertion(.notNil, message: message, file: file, line: line) {`
`359`	`359`	`let value = try expression()`
`360`	`360`	`if value != nil {`
`@@ -365,7 +365,7 @@ public func XCTAssertNotNil(@autoclosure _ expression: () throws -> Any?, @autoc`
`365`	`365`	`}`
`366`	`366`	`}`
`367`	`367`
`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) {`
`369`	`369`	_XCTEvaluateAssertion(.`true`, message: message, file: file, line: line) {
`370`	`370`	`let value = try expression()`
`371`	`371`	`if value.boolValue {`
`@@ -382,7 +382,7 @@ public func XCTFail(_ message: String = "", file: StaticString = #file, line: UI`
`382`	`382`	`}`
`383`	`383`	`}`
`384`	`384`
`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 }) {`
`386`	`386`	`_XCTEvaluateAssertion(.throwsError, message: message, file: file, line: line) {`
`387`	`387`	`var caughtErrorOptional: ErrorProtocol?`
`388`	`388`	`do {`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public class XCTestObservationCenter {`
`71`	`71`	`forEachObserver { $0.testBundleDidFinish(testBundle) }`
`72`	`72`	`}`
`73`	`73`
`74`		`- private func forEachObserver(@noescape _ body: XCTestObservation -> Void) {`
	`74`	`+ private func forEachObserver(_ body: @noescape XCTestObservation -> Void) {`
`75`	`75`	`for observer in observers {`
`76`	`76`	`body(observer.object)`
`77`	`77`	`}`