From d04c5d693ef5d29ff500ca3763202d7551cdeb63 Mon Sep 17 00:00:00 2001 From: Jonathan Grynspan Date: Mon, 25 Sep 2023 11:31:11 -0400 Subject: [PATCH] Rename `memberFunctionCall` argument since it's not always a member function. --- .../Expectations/ExpectationChecking+Macro.swift | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Sources/Testing/Expectations/ExpectationChecking+Macro.swift b/Sources/Testing/Expectations/ExpectationChecking+Macro.swift index f35829c20..55f9c013c 100644 --- a/Sources/Testing/Expectations/ExpectationChecking+Macro.swift +++ b/Sources/Testing/Expectations/ExpectationChecking+Macro.swift @@ -171,13 +171,13 @@ public func __checkBinaryOperation( /// - Warning: This function is used to implement the `#expect()` and /// `#require()` macros. Do not call it directly. public func __checkFunctionCall( - _ lhs: T, calling memberFunctionCall: (T, repeat each U) throws -> Bool, _ arguments: repeat each U, + _ lhs: T, calling functionCall: (T, repeat each U) throws -> Bool, _ arguments: repeat each U, sourceCode: SourceCode, comments: @autoclosure () -> [Comment], isRequired: Bool, sourceLocation: SourceLocation ) rethrows -> Result { - let condition = try memberFunctionCall(lhs, repeat each arguments) + let condition = try functionCall(lhs, repeat each arguments) return __checkValue( condition, sourceCode: sourceCode, @@ -200,13 +200,13 @@ public func __checkFunctionCall( /// - Warning: This function is used to implement the `#expect()` and /// `#require()` macros. Do not call it directly. public func __checkInoutFunctionCall( - _ lhs: T, calling memberFunctionCall: (T, inout /*repeat each*/ U) throws -> Bool, _ arguments: inout /*repeat each*/ U, + _ lhs: T, calling functionCall: (T, inout /*repeat each*/ U) throws -> Bool, _ arguments: inout /*repeat each*/ U, sourceCode: SourceCode, comments: @autoclosure () -> [Comment], isRequired: Bool, sourceLocation: SourceLocation ) rethrows -> Result { - let condition = try memberFunctionCall(lhs, /*repeat each*/ &arguments) + let condition = try functionCall(lhs, /*repeat each*/ &arguments) return __checkValue( condition, sourceCode: sourceCode, @@ -230,13 +230,13 @@ public func __checkInoutFunctionCall( /// - Warning: This function is used to implement the `#expect()` and /// `#require()` macros. Do not call it directly. public func __checkFunctionCall( - _ lhs: T, calling memberFunctionCall: (T, repeat each U) throws -> R?, _ arguments: repeat each U, + _ lhs: T, calling functionCall: (T, repeat each U) throws -> R?, _ arguments: repeat each U, sourceCode: SourceCode, comments: @autoclosure () -> [Comment], isRequired: Bool, sourceLocation: SourceLocation ) rethrows -> Result { - let optionalValue = try memberFunctionCall(lhs, repeat each arguments) + let optionalValue = try functionCall(lhs, repeat each arguments) return __checkValue( optionalValue, sourceCode: sourceCode, @@ -260,13 +260,13 @@ public func __checkFunctionCall( /// - Warning: This function is used to implement the `#expect()` and /// `#require()` macros. Do not call it directly. public func __checkInoutFunctionCall( - _ lhs: T, calling memberFunctionCall: (T, inout /*repeat each*/ U) throws -> R?, _ arguments: inout /*repeat each*/ U, + _ lhs: T, calling functionCall: (T, inout /*repeat each*/ U) throws -> R?, _ arguments: inout /*repeat each*/ U, sourceCode: SourceCode, comments: @autoclosure () -> [Comment], isRequired: Bool, sourceLocation: SourceLocation ) rethrows -> Result { - let optionalValue = try memberFunctionCall(lhs, /*repeat each*/ &arguments) + let optionalValue = try functionCall(lhs, /*repeat each*/ &arguments) return __checkValue( optionalValue, sourceCode: sourceCode,