Merge pull request #155 from CodaFi/SErenata
[NFC] Update for SE-0110 and @noescape-by-default
diff --git a/Sources/XCTest/Private/PerformanceMeter.swift b/Sources/XCTest/Private/PerformanceMeter.swift
index 14ca9f4..5730a0b 100644
--- a/Sources/XCTest/Private/PerformanceMeter.swift
+++ b/Sources/XCTest/Private/PerformanceMeter.swift
@@ -112,7 +112,7 @@
self.invocationLine = line
}
- static func measureMetrics(_ metricNames: [String], delegate: PerformanceMeterDelegate, file: StaticString = #file, line: UInt = #line, for block: @noescape (PerformanceMeter) -> Void) {
+ static func measureMetrics(_ metricNames: [String], delegate: PerformanceMeterDelegate, file: StaticString = #file, line: UInt = #line, for block: (PerformanceMeter) -> Void) {
do {
let metrics = try self.metrics(forNames: metricNames)
let meter = PerformanceMeter(metrics: metrics, delegate: delegate, file: file, line: line)
@@ -163,7 +163,7 @@
return 10
}
- private func measure(_ block: @noescape (PerformanceMeter) -> Void) {
+ private func measure(_ block: (PerformanceMeter) -> Void) {
for _ in (0..<numberOfIterations) {
state = .iterationUnstarted
diff --git a/Sources/XCTest/Private/TestFiltering.swift b/Sources/XCTest/Private/TestFiltering.swift
index 702f62e..4c5274d 100644
--- a/Sources/XCTest/Private/TestFiltering.swift
+++ b/Sources/XCTest/Private/TestFiltering.swift
@@ -28,11 +28,11 @@
}
private func excludeAllFilter() -> TestFilter {
- return { _ in false }
+ return { _,_ in false }
}
private func includeAllFilter() -> TestFilter {
- return { _ in true }
+ return { _,_ in true }
}
static func filterTests(_ entries: [XCTestCaseEntry], filter: TestFilter) -> [XCTestCaseEntry] {
diff --git a/Sources/XCTest/Public/XCTAssert.swift b/Sources/XCTest/Public/XCTAssert.swift
index 4fac04e..7b2aae2 100644
--- a/Sources/XCTest/Public/XCTAssert.swift
+++ b/Sources/XCTest/Public/XCTAssert.swift
@@ -75,7 +75,7 @@
}
}
-private func _XCTEvaluateAssertion(_ assertion: _XCTAssertion, message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line, expression: @noescape () throws -> _XCTAssertionResult) {
+private func _XCTEvaluateAssertion(_ assertion: _XCTAssertion, message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line, expression: () throws -> _XCTAssertionResult) {
let result: _XCTAssertionResult
do {
result = try expression()
diff --git a/Sources/XCTest/Public/XCTestObservationCenter.swift b/Sources/XCTest/Public/XCTestObservationCenter.swift
index fc34dc0..77681c8 100644
--- a/Sources/XCTest/Public/XCTestObservationCenter.swift
+++ b/Sources/XCTest/Public/XCTestObservationCenter.swift
@@ -75,13 +75,13 @@
forEachInternalObserver { $0.testCase(testCase, didMeasurePerformanceResults: results, file: file, line: line) }
}
- private func forEachObserver(_ body: @noescape (XCTestObservation) -> Void) {
+ private func forEachObserver(_ body: (XCTestObservation) -> Void) {
for observer in observers {
body(observer.object)
}
}
- private func forEachInternalObserver(_ body: @noescape (XCTestInternalObservation) -> Void) {
+ private func forEachInternalObserver(_ body: (XCTestInternalObservation) -> Void) {
for observer in observers where observer.object is XCTestInternalObservation {
body(observer.object as! XCTestInternalObservation)
}
