From 0a8c702e0df9d8ff66f2dc6e7437b208c2f8a518 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 13 Sep 2021 17:02:35 -0700 Subject: [PATCH] Remove default arguments from private functions Since these are only ever called internally, these arguments should always be passed so it doesn't accidentally fall back to this file for expanding `#file` and friends. --- Sources/XCTest/Public/XCTAssert.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/XCTest/Public/XCTAssert.swift b/Sources/XCTest/Public/XCTAssert.swift index a70dfb5b..d96e9ba8 100644 --- a/Sources/XCTest/Public/XCTAssert.swift +++ b/Sources/XCTest/Public/XCTAssert.swift @@ -83,7 +83,7 @@ private enum _XCTAssertionResult { } } -private func _XCTEvaluateAssertion(_ assertion: _XCTAssertion, message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line, expression: () throws -> _XCTAssertionResult) { +private func _XCTEvaluateAssertion(_ assertion: _XCTAssertion, message: @autoclosure () -> String, file: StaticString, line: UInt, expression: () throws -> _XCTAssertionResult) { let result: _XCTAssertionResult do { result = try expression() @@ -194,7 +194,7 @@ public func XCTAssertEqual(_ expression1: @autoclosure () throws -> _XCTAssertEqual(try expression1(), try expression2(), accuracy: accuracy, message(), file: file, line: line) } -private func _XCTAssertEqual(_ expression1: @autoclosure () throws -> T, _ expression2: @autoclosure () throws -> T, accuracy: T, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) { +private func _XCTAssertEqual(_ expression1: @autoclosure () throws -> T, _ expression2: @autoclosure () throws -> T, accuracy: T, _ message: @autoclosure () -> String, file: StaticString, line: UInt) { _XCTEvaluateAssertion(.equalWithAccuracy, message: message(), file: file, line: line) { let (value1, value2) = (try expression1(), try expression2()) if areEqual(value1, value2, accuracy: accuracy) { @@ -323,7 +323,7 @@ public func XCTAssertNotEqual(_ expression1: @autoclosure () throws _XCTAssertNotEqual(try expression1(), try expression2(), accuracy: accuracy, message(), file: file, line: line) } -private func _XCTAssertNotEqual(_ expression1: @autoclosure () throws -> T, _ expression2: @autoclosure () throws -> T, accuracy: T, _ message: @autoclosure () -> String = "", file: StaticString = #file, line: UInt = #line) { +private func _XCTAssertNotEqual(_ expression1: @autoclosure () throws -> T, _ expression2: @autoclosure () throws -> T, accuracy: T, _ message: @autoclosure () -> String, file: StaticString, line: UInt) { _XCTEvaluateAssertion(.notEqualWithAccuracy, message: message(), file: file, line: line) { let (value1, value2) = (try expression1(), try expression2()) if !areEqual(value1, value2, accuracy: accuracy) {