Skip to content

Commit 7534be2

Browse files
samuelmurraysamuelmurray
committed
Make error parameter @autoclosure 
1 parent 8fe187d commit 7534be2

2 files changed

Lines changed: 27 additions & 25 deletions

File tree

‎Sources/Logging/Logging.swift‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ extension Logger {
121121
public func log(
122122
level: Logger.Level,
123123
_ message: @autoclosure () -> Logger.Message,
124-
error: (any Error)? = nil,
124+
error: @autoclosure () -> (any Error)? = nil,
125125
metadata: @autoclosure () -> Logger.Metadata? = nil,
126126
source: @autoclosure () -> String? = nil,
127127
file: String = #fileID,
@@ -135,7 +135,7 @@ extension Logger {
135135
case .trace:
136136
self.trace(
137137
message(),
138-
error: error,
138+
error: error(),
139139
metadata: metadata(),
140140
source: source(),
141141
file: file,
@@ -145,7 +145,7 @@ extension Logger {
145145
case .debug:
146146
self.debug(
147147
message(),
148-
error: error,
148+
error: error(),
149149
metadata: metadata(),
150150
source: source(),
151151
file: file,
@@ -155,7 +155,7 @@ extension Logger {
155155
case .info:
156156
self.info(
157157
message(),
158-
error: error,
158+
error: error(),
159159
metadata: metadata(),
160160
source: source(),
161161
file: file,
@@ -165,7 +165,7 @@ extension Logger {
165165
case .notice:
166166
self.notice(
167167
message(),
168-
error: error,
168+
error: error(),
169169
metadata: metadata(),
170170
source: source(),
171171
file: file,
@@ -175,7 +175,7 @@ extension Logger {
175175
case .warning:
176176
self.warning(
177177
message(),
178-
error: error,
178+
error: error(),
179179
metadata: metadata(),
180180
source: source(),
181181
file: file,
@@ -185,7 +185,7 @@ extension Logger {
185185
case .error:
186186
self.error(
187187
message(),
188-
error: error,
188+
error: error(),
189189
metadata: metadata(),
190190
source: source(),
191191
file: file,
@@ -195,7 +195,7 @@ extension Logger {
195195
case .critical:
196196
self.critical(
197197
message(),
198-
error: error,
198+
error: error(),
199199
metadata: metadata(),
200200
source: source(),
201201
file: file,
@@ -208,7 +208,7 @@ extension Logger {
208208
self._log(
209209
level: level,
210210
message(),
211-
error: error,
211+
error: error(),
212212
metadata: metadata(),
213213
source: source(),
214214
file: file,
@@ -280,7 +280,7 @@ extension Logger {
280280
package func _log(
281281
level: Logger.Level,
282282
_ message: @autoclosure () -> Logger.Message,
283-
error: (any Error)? = nil,
283+
error: @autoclosure () -> (any Error)? = nil,
284284
metadata: @autoclosure () -> Logger.Metadata? = nil,
285285
source: @autoclosure () -> String? = nil,
286286
file: String = #fileID,
@@ -292,7 +292,7 @@ extension Logger {
292292
event: LogEvent(
293293
level: level,
294294
message: message(),
295-
error: error,
295+
error: error(),
296296
metadata: metadata(),
297297
source: source(),
298298
file: file,
@@ -383,7 +383,7 @@ extension Logger {
383383
@inlinable
384384
public func trace(
385385
_ message: @autoclosure () -> Logger.Message,
386-
error: (any Error)? = nil,
386+
error: @autoclosure () -> (any Error)? = nil,
387387
metadata: @autoclosure () -> Logger.Metadata? = nil,
388388
source: @autoclosure () -> String? = nil,
389389
file: String = #fileID,
@@ -394,7 +394,7 @@ extension Logger {
394394
self._log(
395395
level: .trace,
396396
message(),
397-
error: error,
397+
error: error(),
398398
metadata: metadata(),
399399
source: source(),
400400
file: file,
@@ -485,7 +485,7 @@ extension Logger {
485485
@inlinable
486486
public func debug(
487487
_ message: @autoclosure () -> Logger.Message,
488-
error: (any Error)? = nil,
488+
error: @autoclosure () -> (any Error)? = nil,
489489
metadata: @autoclosure () -> Logger.Metadata? = nil,
490490
source: @autoclosure () -> String? = nil,
491491
file: String = #fileID,
@@ -496,7 +496,7 @@ extension Logger {
496496
self._log(
497497
level: .debug,
498498
message(),
499-
error: error,
499+
error: error(),
500500
metadata: metadata(),
501501
source: source(),
502502
file: file,
@@ -587,7 +587,7 @@ extension Logger {
587587
@inlinable
588588
public func info(
589589
_ message: @autoclosure () -> Logger.Message,
590-
error: (any Error)? = nil,
590+
error: @autoclosure () -> (any Error)? = nil,
591591
metadata: @autoclosure () -> Logger.Metadata? = nil,
592592
source: @autoclosure () -> String? = nil,
593593
file: String = #fileID,
@@ -598,7 +598,7 @@ extension Logger {
598598
self._log(
599599
level: .info,
600600
message(),
601-
error: error,
601+
error: error(),
602602
metadata: metadata(),
603603
source: source(),
604604
file: file,
@@ -689,7 +689,7 @@ extension Logger {
689689
@inlinable
690690
public func notice(
691691
_ message: @autoclosure () -> Logger.Message,
692-
error: (any Error)? = nil,
692+
error: @autoclosure () -> (any Error)? = nil,
693693
metadata: @autoclosure () -> Logger.Metadata? = nil,
694694
source: @autoclosure () -> String? = nil,
695695
file: String = #fileID,
@@ -700,7 +700,7 @@ extension Logger {
700700
self._log(
701701
level: .notice,
702702
message(),
703-
error: error,
703+
error: error(),
704704
metadata: metadata(),
705705
source: source(),
706706
file: file,
@@ -791,7 +791,7 @@ extension Logger {
791791
@inlinable
792792
public func warning(
793793
_ message: @autoclosure () -> Logger.Message,
794-
error: (any Error)? = nil,
794+
error: @autoclosure () -> (any Error)? = nil,
795795
metadata: @autoclosure () -> Logger.Metadata? = nil,
796796
source: @autoclosure () -> String? = nil,
797797
file: String = #fileID,
@@ -802,7 +802,7 @@ extension Logger {
802802
self._log(
803803
level: .warning,
804804
message(),
805-
error: error,
805+
error: error(),
806806
metadata: metadata(),
807807
source: source(),
808808
file: file,
@@ -893,7 +893,7 @@ extension Logger {
893893
@inlinable
894894
public func error(
895895
_ message: @autoclosure () -> Logger.Message,
896-
error: (any Error)? = nil,
896+
error: @autoclosure () -> (any Error)? = nil,
897897
metadata: @autoclosure () -> Logger.Metadata? = nil,
898898
source: @autoclosure () -> String? = nil,
899899
file: String = #fileID,
@@ -904,7 +904,7 @@ extension Logger {
904904
self._log(
905905
level: .error,
906906
message(),
907-
error: error,
907+
error: error(),
908908
metadata: metadata(),
909909
source: source(),
910910
file: file,
@@ -995,7 +995,7 @@ extension Logger {
995995
@inlinable
996996
public func critical(
997997
_ message: @autoclosure () -> Logger.Message,
998-
error: (any Error)? = nil,
998+
error: @autoclosure () -> (any Error)? = nil,
999999
metadata: @autoclosure () -> Logger.Metadata? = nil,
10001000
source: @autoclosure () -> String? = nil,
10011001
file: String = #fileID,
@@ -1006,7 +1006,7 @@ extension Logger {
10061006
self._log(
10071007
level: .critical,
10081008
message(),
1009-
error: error,
1009+
error: error(),
10101010
metadata: metadata(),
10111011
source: source(),
10121012
file: file,

‎Tests/LoggingTests/LoggingTest.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ struct LoggingTest {
387387

388388
enum TestError: Error {
389389
case boom
390+
case withMessage(String)
390391
}
391392

392393
@Test func dictionaryMetadata() {
@@ -515,6 +516,7 @@ struct LoggingTest {
515516
logger.debug(self.dontEvaluateThisString())
516517
logger.info(self.dontEvaluateThisString())
517518
logger.warning(self.dontEvaluateThisString())
519+
logger.warning(self.dontEvaluateThisString(), error: TestError.withMessage("\(self.dontEvaluateThisString())"))
518520
logger.log(level: .warning, self.dontEvaluateThisString())
519521
}
520522

0 commit comments

Comments
 (0)