Skip to content

Commit 1516e0c

Browse files
fabianfettfabianfett
authored
Use #fileID and #filePath instead of #file (#348)
1 parent 369a9ee commit 1516e0c

15 files changed

+93
-91
lines changed

‎Sources/PostgresNIO/Data/PostgresRow.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ extension PostgresRandomAccessRow {
217217
column: String,
218218
as type: T.Type,
219219
context: PostgresDecodingContext<JSONDecoder>,
220-
file: String = #file, line: Int = #line
220+
file: String = #fileID, line: Int = #line
221221
) throws -> T {
222222
guard let index = self.lookupTable[column] else {
223223
fatalError(#"A column "\#(column)" does not exist."#)
@@ -237,7 +237,7 @@ extension PostgresRandomAccessRow {
237237
column index: Int,
238238
as type: T.Type,
239239
context: PostgresDecodingContext<JSONDecoder>,
240-
file: String = #file, line: Int = #line
240+
file: String = #fileID, line: Int = #line
241241
) throws -> T {
242242
precondition(index < self.columns.count)
243243

‎Sources/PostgresNIO/Deprecated/PostgresData+UInt.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
private func warn(
22
_ old: Any.Type, mustBeConvertedTo new: Any.Type,
3-
file: StaticString = #file, line: UInt = #line
3+
file: StaticString = #filePath, line: UInt = #line
44
) {
55
assertionFailure("""
66
Integer conversion unsafe.

‎Sources/PostgresNIO/New/Extensions/Logging+PSQL.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ extension Logger {
8686
func trace(_ message: @autoclosure () -> Logger.Message,
8787
metadata: @autoclosure () -> PSQLLoggingMetadata,
8888
source: @autoclosure () -> String? = nil,
89-
file: String = #file, function: String = #function, line: UInt = #line) {
89+
file: String = #fileID, function: String = #function, line: UInt = #line) {
9090
self.log(level: .trace, message(), metadata: metadata().representation, source: source(), file: file, function: function, line: line)
9191
}
9292

@@ -95,7 +95,7 @@ extension Logger {
9595
func debug(_ message: @autoclosure () -> Logger.Message,
9696
metadata: @autoclosure () -> PSQLLoggingMetadata,
9797
source: @autoclosure () -> String? = nil,
98-
file: String = #file, function: String = #function, line: UInt = #line) {
98+
file: String = #fileID, function: String = #function, line: UInt = #line) {
9999
self.log(level: .debug, message(), metadata: metadata().representation, source: source(), file: file, function: function, line: line)
100100
}
101101

@@ -104,7 +104,7 @@ extension Logger {
104104
func info(_ message: @autoclosure () -> Logger.Message,
105105
metadata: @autoclosure () -> PSQLLoggingMetadata,
106106
source: @autoclosure () -> String? = nil,
107-
file: String = #file, function: String = #function, line: UInt = #line) {
107+
file: String = #fileID, function: String = #function, line: UInt = #line) {
108108
self.log(level: .info, message(), metadata: metadata().representation, source: source(), file: file, function: function, line: line)
109109
}
110110

@@ -113,7 +113,7 @@ extension Logger {
113113
func notice(_ message: @autoclosure () -> Logger.Message,
114114
metadata: @autoclosure () -> PSQLLoggingMetadata,
115115
source: @autoclosure () -> String? = nil,
116-
file: String = #file, function: String = #function, line: UInt = #line) {
116+
file: String = #fileID, function: String = #function, line: UInt = #line) {
117117
self.log(level: .notice, message(), metadata: metadata().representation, source: source(), file: file, function: function, line: line)
118118
}
119119

@@ -122,7 +122,7 @@ extension Logger {
122122
func warning(_ message: @autoclosure () -> Logger.Message,
123123
metadata: @autoclosure () -> PSQLLoggingMetadata,
124124
source: @autoclosure () -> String? = nil,
125-
file: String = #file, function: String = #function, line: UInt = #line) {
125+
file: String = #fileID, function: String = #function, line: UInt = #line) {
126126
self.log(level: .warning, message(), metadata: metadata().representation, source: source(), file: file, function: function, line: line)
127127
}
128128

@@ -131,7 +131,7 @@ extension Logger {
131131
func error(_ message: @autoclosure () -> Logger.Message,
132132
metadata: @autoclosure () -> PSQLLoggingMetadata,
133133
source: @autoclosure () -> String? = nil,
134-
file: String = #file, function: String = #function, line: UInt = #line) {
134+
file: String = #fileID, function: String = #function, line: UInt = #line) {
135135
self.log(level: .error, message(), metadata: metadata().representation, source: source(), file: file, function: function, line: line)
136136
}
137137

@@ -140,7 +140,7 @@ extension Logger {
140140
func critical(_ message: @autoclosure () -> Logger.Message,
141141
metadata: @autoclosure () -> PSQLLoggingMetadata,
142142
source: @autoclosure () -> String? = nil,
143-
file: String = #file, function: String = #function, line: UInt = #line) {
143+
file: String = #fileID, function: String = #function, line: UInt = #line) {
144144
self.log(level: .critical, message(), metadata: metadata().representation, source: source(), file: file, function: function, line: line)
145145
}
146146
}

‎Sources/PostgresNIO/New/PostgresBackendMessageDecoder.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ struct PostgresMessageDecodingError: Error {
123123
static func unknownMessageIDReceived(
124124
messageID: UInt8,
125125
messageBytes: ByteBuffer,
126-
file: String = #file,
126+
file: String = #fileID,
127127
line: Int = #line) -> Self
128128
{
129129
var byteBuffer = messageBytes
@@ -152,54 +152,54 @@ struct PSQLPartialDecodingError: Error {
152152
static func valueNotRawRepresentable<Target: RawRepresentable>(
153153
value: Target.RawValue,
154154
asType: Target.Type,
155-
file: String = #file,
155+
file: String = #fileID,
156156
line: Int = #line) -> Self
157157
{
158158
return PSQLPartialDecodingError(
159159
description: "Can not represent '\(value)' with type '\(asType)'.",
160160
file: file, line: line)
161161
}
162162

163-
static func unexpectedValue(value: Any, file: String = #file, line: Int = #line) -> Self {
163+
static func unexpectedValue(value: Any, file: String = #fileID, line: Int = #line) -> Self {
164164
return PSQLPartialDecodingError(
165165
description: "Value '\(value)' is not expected.",
166166
file: file, line: line)
167167
}
168168

169-
static func expectedAtLeastNRemainingBytes(_ expected: Int, actual: Int, file: String = #file, line: Int = #line) -> Self {
169+
static func expectedAtLeastNRemainingBytes(_ expected: Int, actual: Int, file: String = #fileID, line: Int = #line) -> Self {
170170
return PSQLPartialDecodingError(
171171
description: "Expected at least '\(expected)' remaining bytes. But only found \(actual).",
172172
file: file, line: line)
173173
}
174174

175-
static func expectedExactlyNRemainingBytes(_ expected: Int, actual: Int, file: String = #file, line: Int = #line) -> Self {
175+
static func expectedExactlyNRemainingBytes(_ expected: Int, actual: Int, file: String = #fileID, line: Int = #line) -> Self {
176176
return PSQLPartialDecodingError(
177177
description: "Expected exactly '\(expected)' remaining bytes. But found \(actual).",
178178
file: file, line: line)
179179
}
180180

181-
static func fieldNotDecodable(type: Any.Type, file: String = #file, line: Int = #line) -> Self {
181+
static func fieldNotDecodable(type: Any.Type, file: String = #fileID, line: Int = #line) -> Self {
182182
return PSQLPartialDecodingError(
183183
description: "Could not read '\(type)' from ByteBuffer.",
184184
file: file, line: line)
185185
}
186186

187-
static func integerMustBePositiveOrNull<Number: FixedWidthInteger>(_ actual: Number, file: String = #file, line: Int = #line) -> Self {
187+
static func integerMustBePositiveOrNull<Number: FixedWidthInteger>(_ actual: Number, file: String = #fileID, line: Int = #line) -> Self {
188188
return PSQLPartialDecodingError(
189189
description: "Expected the integer to be positive or null, but got \(actual).",
190190
file: file, line: line)
191191
}
192192
}
193193

194194
extension ByteBuffer {
195-
mutating func throwingReadInteger<I: FixedWidthInteger>(as: I.Type, file: String = #file, line: Int = #line) throws -> I {
195+
mutating func throwingReadInteger<I: FixedWidthInteger>(as: I.Type, file: String = #fileID, line: Int = #line) throws -> I {
196196
guard let result = self.readInteger(endianness: .big, as: I.self) else {
197197
throw PSQLPartialDecodingError.expectedAtLeastNRemainingBytes(MemoryLayout<I>.size, actual: self.readableBytes, file: file, line: line)
198198
}
199199
return result
200200
}
201201

202-
mutating func throwingMoveReaderIndex(forwardBy offset: Int, file: String = #file, line: Int = #line) throws {
202+
mutating func throwingMoveReaderIndex(forwardBy offset: Int, file: String = #fileID, line: Int = #line) throws {
203203
guard self.readSlice(length: offset) != nil else {
204204
throw PSQLPartialDecodingError.expectedAtLeastNRemainingBytes(offset, actual: self.readableBytes, file: file, line: line)
205205
}

‎Sources/PostgresNIO/New/PostgresCell.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ extension PostgresCell {
4343
public func decode<T: PostgresDecodable, JSONDecoder: PostgresJSONDecoder>(
4444
_: T.Type,
4545
context: PostgresDecodingContext<JSONDecoder>,
46-
file: String = #file,
46+
file: String = #fileID,
4747
line: Int = #line
4848
) throws -> T {
4949
var copy = self.bytes
@@ -80,7 +80,7 @@ extension PostgresCell {
8080
@inlinable
8181
public func decode<T: PostgresDecodable>(
8282
_: T.Type,
83-
file: String = #file,
83+
file: String = #fileID,
8484
line: Int = #line
8585
) throws -> T {
8686
try self.decode(T.self, context: .default, file: file, line: line)

0 commit comments

Comments
 (0)