From 94403f5df01cc6758e95a01a3c6be77f064f27e6 Mon Sep 17 00:00:00 2001 From: Timo <38291523+lovetodream@users.noreply.github.com> Date: Wed, 18 Sep 2024 08:29:31 +0200 Subject: [PATCH] run swift format using bundled swift-format --- Sources/OracleNIO/Deprecations.swift | 10 +++++----- scripts/run-swift-format.sh | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Sources/OracleNIO/Deprecations.swift b/Sources/OracleNIO/Deprecations.swift index dd95d53..35c5999 100644 --- a/Sources/OracleNIO/Deprecations.swift +++ b/Sources/OracleNIO/Deprecations.swift @@ -16,22 +16,22 @@ import struct Logging.Logger -@_documentation(visibility:internal) +@_documentation(visibility: internal) @available(*, deprecated, renamed: "OracleStatement") public typealias OracleQuery = OracleStatement -@_documentation(visibility:internal) +@_documentation(visibility: internal) @available(*, deprecated, renamed: "StatementOptions") public typealias QueryOptions = StatementOptions extension OracleSQLError.Code { - @_documentation(visibility:internal) + @_documentation(visibility: internal) @available(*, deprecated, renamed: "statementCancelled") public static let queryCancelled = OracleSQLError.Code.statementCancelled } extension OracleSQLError { - @_documentation(visibility:internal) + @_documentation(visibility: internal) @available(*, deprecated, renamed: "statement", message: "will be removed before 1.0.0") public internal(set) var query: OracleQuery? { get { self.statement } @@ -42,7 +42,7 @@ extension OracleSQLError { } extension OracleConnection { - @_documentation(visibility:internal) + @_documentation(visibility: internal) @available(*, deprecated, renamed: "execute(_:options:logger:file:line:)") @discardableResult public func query( diff --git a/scripts/run-swift-format.sh b/scripts/run-swift-format.sh index 115e95d..8a7a835 100755 --- a/scripts/run-swift-format.sh +++ b/scripts/run-swift-format.sh @@ -22,14 +22,14 @@ fatal() { error "$@"; exit 1; } CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" REPO_ROOT="$(git -C "${CURRENT_SCRIPT_DIR}" rev-parse --show-toplevel)" -FORMAT_COMMAND=(lint --strict) +FORMAT_COMMAND=(format lint --strict) for arg in "$@"; do if [ "$arg" == "--fix" ]; then FORMAT_COMMAND=(format --in-place) fi done -SWIFTFORMAT_BIN=${SWIFTFORMAT_BIN:-$(command -v swift-format)} || fatal "❌ SWIFTFORMAT_BIN unset and no swift-format on PATH" +SWIFTFORMAT_BIN=${SWIFTFORMAT_BIN:-$(command -v swift)} || fatal "❌ SWIFTFORMAT_BIN unset and no swift-format on PATH" git -C "${REPO_ROOT}" ls-files -z '*.swift' \ | grep -z -v -e 'Tests/LoggingLoki/Resources' \