Skip to content

Commit 32d5def

Browse files
xuwei-kanalytically
xuwei-k
authored and
analytically
committed
use lengthIs instead of length
1 parent e14ef34 commit 32d5def

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

‎src/main/scala-3/com/typesafe/scalalogging/LoggerMacro.scala

+10-10
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ private[scalalogging] object LoggerMacro {
2020
val anyRefArgs = formatArgs(args)
2121
if(anyRefArgs.isEmpty)
2222
'{ if ($underlying.isErrorEnabled) $underlying.error($message) }
23-
else if(anyRefArgs.length == 1)
23+
else if(anyRefArgs.lengthIs == 1)
2424
'{ if ($underlying.isErrorEnabled) $underlying.error($message, ${anyRefArgs.head}) }
2525
else
2626
'{ if ($underlying.isErrorEnabled) $underlying.error($message, ${Expr.ofSeq(anyRefArgs)}*) }
@@ -38,7 +38,7 @@ private[scalalogging] object LoggerMacro {
3838
val anyRefArgs = formatArgs(args)
3939
if(anyRefArgs.isEmpty)
4040
'{ if ($underlying.isErrorEnabled($marker)) $underlying.error($marker, $message) }
41-
else if(anyRefArgs.length == 1)
41+
else if(anyRefArgs.lengthIs == 1)
4242
'{if ($underlying.isErrorEnabled($marker)) $underlying.error($marker, $message, ${anyRefArgs.head}) }
4343
else
4444
'{ if ($underlying.isErrorEnabled($marker)) $underlying.error($marker, $message, ${Expr.ofSeq(anyRefArgs)}*) }
@@ -64,7 +64,7 @@ private[scalalogging] object LoggerMacro {
6464
val anyRefArgs = formatArgs(args)
6565
if(anyRefArgs.isEmpty)
6666
'{ if ($underlying.isWarnEnabled) $underlying.warn($message) }
67-
else if(anyRefArgs.length == 1)
67+
else if(anyRefArgs.lengthIs == 1)
6868
'{ if ($underlying.isWarnEnabled) $underlying.warn($message, ${anyRefArgs.head}) }
6969
else
7070
'{ if ($underlying.isWarnEnabled) $underlying.warn($message, ${Expr.ofSeq(anyRefArgs)}*) }
@@ -82,7 +82,7 @@ private[scalalogging] object LoggerMacro {
8282
val anyRefArgs = formatArgs(args)
8383
if(anyRefArgs.isEmpty)
8484
'{ if ($underlying.isWarnEnabled($marker)) $underlying.warn($marker, $message) }
85-
else if(anyRefArgs.length == 1)
85+
else if(anyRefArgs.lengthIs == 1)
8686
'{if ($underlying.isWarnEnabled($marker)) $underlying.warn($marker, $message, ${anyRefArgs.head}) }
8787
else
8888
'{ if ($underlying.isWarnEnabled($marker)) $underlying.warn($marker, $message, ${Expr.ofSeq(anyRefArgs)}*) }
@@ -108,7 +108,7 @@ private[scalalogging] object LoggerMacro {
108108
val anyRefArgs = formatArgs(args)
109109
if(anyRefArgs.isEmpty)
110110
'{ if ($underlying.isInfoEnabled) $underlying.info($message) }
111-
else if(anyRefArgs.length == 1)
111+
else if(anyRefArgs.lengthIs == 1)
112112
'{ if ($underlying.isInfoEnabled) $underlying.info($message, ${anyRefArgs.head}) }
113113
else
114114
'{ if ($underlying.isInfoEnabled) $underlying.info($message, ${Expr.ofSeq(anyRefArgs)}*) }
@@ -126,7 +126,7 @@ private[scalalogging] object LoggerMacro {
126126
val anyRefArgs = formatArgs(args)
127127
if(anyRefArgs.isEmpty)
128128
'{ if ($underlying.isInfoEnabled($marker)) $underlying.info($marker, $message) }
129-
else if(anyRefArgs.length == 1)
129+
else if(anyRefArgs.lengthIs == 1)
130130
'{if ($underlying.isInfoEnabled($marker)) $underlying.info($marker, $message, ${anyRefArgs.head}) }
131131
else
132132
'{ if ($underlying.isInfoEnabled($marker)) $underlying.info($marker, $message, ${Expr.ofSeq(anyRefArgs)}*) }
@@ -153,7 +153,7 @@ private[scalalogging] object LoggerMacro {
153153
val anyRefArgs = formatArgs(args)
154154
if(anyRefArgs.isEmpty)
155155
'{ if ($underlying.isDebugEnabled) $underlying.debug($message) }
156-
else if(anyRefArgs.length == 1)
156+
else if(anyRefArgs.lengthIs == 1)
157157
'{ if ($underlying.isDebugEnabled) $underlying.debug($message, ${anyRefArgs.head}) }
158158
else
159159
'{ if ($underlying.isDebugEnabled) $underlying.debug($message, ${Expr.ofSeq(anyRefArgs)}*) }
@@ -171,7 +171,7 @@ private[scalalogging] object LoggerMacro {
171171
val anyRefArgs = formatArgs(args)
172172
if(anyRefArgs.isEmpty)
173173
'{ if ($underlying.isDebugEnabled($marker)) $underlying.debug($marker, $message) }
174-
else if(anyRefArgs.length == 1)
174+
else if(anyRefArgs.lengthIs == 1)
175175
'{if ($underlying.isDebugEnabled($marker)) $underlying.debug($marker, $message, ${anyRefArgs.head}) }
176176
else
177177
'{ if ($underlying.isDebugEnabled($marker)) $underlying.debug($marker, $message, ${Expr.ofSeq(anyRefArgs)}*) }
@@ -197,7 +197,7 @@ private[scalalogging] object LoggerMacro {
197197
val anyRefArgs = formatArgs(args)
198198
if(anyRefArgs.isEmpty)
199199
'{ if ($underlying.isTraceEnabled) $underlying.trace($message) }
200-
else if(anyRefArgs.length == 1)
200+
else if(anyRefArgs.lengthIs == 1)
201201
'{ if ($underlying.isTraceEnabled) $underlying.trace($message, ${anyRefArgs.head}) }
202202
else
203203
'{ if ($underlying.isTraceEnabled) $underlying.trace($message, ${Expr.ofSeq(anyRefArgs)}*) }
@@ -215,7 +215,7 @@ private[scalalogging] object LoggerMacro {
215215
val anyRefArgs = formatArgs(args)
216216
if(anyRefArgs.isEmpty)
217217
'{ if ($underlying.isTraceEnabled($marker)) $underlying.trace($marker, $message) }
218-
else if(anyRefArgs.length == 1)
218+
else if(anyRefArgs.lengthIs == 1)
219219
'{if ($underlying.isTraceEnabled($marker)) $underlying.trace($marker, $message, ${anyRefArgs.head}) }
220220
else
221221
'{ if ($underlying.isTraceEnabled($marker)) $underlying.trace($marker, $message, ${Expr.ofSeq(anyRefArgs)}*) }

‎src/main/scala-3/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala

+10-10
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ private[scalalogging] object LoggerTakingImplicitMacro {
2222

2323
def errorMessageArgs[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = {
2424
val formatedArgs = LoggerMacro.formatArgs(args)
25-
if (formatedArgs.length == 1)
25+
if (formatedArgs.lengthIs == 1)
2626
'{if ($underlying.isErrorEnabled) {
2727
$underlying.error($canLogEv.logMessage($message, $a), ${formatedArgs.head})
2828
$canLogEv.afterLog($a)
@@ -48,7 +48,7 @@ private[scalalogging] object LoggerTakingImplicitMacro {
4848

4949
def errorMessageArgsMarker[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], marker: Expr[Marker], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = {
5050
val formatedArgs = LoggerMacro.formatArgs(args)
51-
if (formatedArgs.length == 1)
51+
if (formatedArgs.lengthIs == 1)
5252
'{if ($underlying.isErrorEnabled($marker)) {
5353
$underlying.error($marker, $canLogEv.logMessage($message, $a), ${formatedArgs.head})
5454
$canLogEv.afterLog($a)
@@ -82,7 +82,7 @@ private[scalalogging] object LoggerTakingImplicitMacro {
8282

8383
def warnMessageArgs[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = {
8484
val formatedArgs = LoggerMacro.formatArgs(args)
85-
if (formatedArgs.length == 1)
85+
if (formatedArgs.lengthIs == 1)
8686
'{if ($underlying.isWarnEnabled) {
8787
$underlying.warn($canLogEv.logMessage($message, $a), ${formatedArgs.head})
8888
$canLogEv.afterLog($a)
@@ -108,7 +108,7 @@ private[scalalogging] object LoggerTakingImplicitMacro {
108108

109109
def warnMessageArgsMarker[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], marker: Expr[Marker], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = {
110110
val formatedArgs = LoggerMacro.formatArgs(args)
111-
if (formatedArgs.length == 1)
111+
if (formatedArgs.lengthIs == 1)
112112
'{if ($underlying.isWarnEnabled($marker)) {
113113
$underlying.warn($marker, $canLogEv.logMessage($message, $a), ${formatedArgs.head})
114114
$canLogEv.afterLog($a)
@@ -143,7 +143,7 @@ private[scalalogging] object LoggerTakingImplicitMacro {
143143

144144
def infoMessageArgs[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = {
145145
val formatedArgs = LoggerMacro.formatArgs(args)
146-
if (formatedArgs.length == 1)
146+
if (formatedArgs.lengthIs == 1)
147147
'{if ($underlying.isInfoEnabled) {
148148
$underlying.info($canLogEv.logMessage($message, $a), ${formatedArgs.head})
149149
$canLogEv.afterLog($a)
@@ -169,7 +169,7 @@ private[scalalogging] object LoggerTakingImplicitMacro {
169169

170170
def infoMessageArgsMarker[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], marker: Expr[Marker], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = {
171171
val formatedArgs = LoggerMacro.formatArgs(args)
172-
if (formatedArgs.length == 1)
172+
if (formatedArgs.lengthIs == 1)
173173
'{if ($underlying.isInfoEnabled($marker)) {
174174
$underlying.info($marker, $canLogEv.logMessage($message, $a), ${formatedArgs.head})
175175
$canLogEv.afterLog($a)
@@ -204,7 +204,7 @@ private[scalalogging] object LoggerTakingImplicitMacro {
204204

205205
def debugMessageArgs[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = {
206206
val formatedArgs = LoggerMacro.formatArgs(args)
207-
if (formatedArgs.length == 1)
207+
if (formatedArgs.lengthIs == 1)
208208
'{if ($underlying.isDebugEnabled) {
209209
$underlying.debug($canLogEv.logMessage($message, $a), ${formatedArgs.head})
210210
$canLogEv.afterLog($a)
@@ -230,7 +230,7 @@ private[scalalogging] object LoggerTakingImplicitMacro {
230230

231231
def debugMessageArgsMarker[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], marker: Expr[Marker], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = {
232232
val formatedArgs = LoggerMacro.formatArgs(args)
233-
if (formatedArgs.length == 1)
233+
if (formatedArgs.lengthIs == 1)
234234
'{if ($underlying.isDebugEnabled($marker)) {
235235
$underlying.debug($marker, $canLogEv.logMessage($message, $a), ${formatedArgs.head})
236236
$canLogEv.afterLog($a)
@@ -265,7 +265,7 @@ private[scalalogging] object LoggerTakingImplicitMacro {
265265

266266
def traceMessageArgs[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = {
267267
val formatedArgs = LoggerMacro.formatArgs(args)
268-
if (formatedArgs.length == 1)
268+
if (formatedArgs.lengthIs == 1)
269269
'{if ($underlying.isTraceEnabled) {
270270
$underlying.trace($canLogEv.logMessage($message, $a), ${formatedArgs.head})
271271
$canLogEv.afterLog($a)
@@ -291,7 +291,7 @@ private[scalalogging] object LoggerTakingImplicitMacro {
291291

292292
def traceMessageArgsMarker[A: Type](underlying: Expr[Underlying], canLogEv: Expr[CanLog[A]], marker: Expr[Marker], message: Expr[String], args: Expr[Seq[Any]])(a: Expr[A])(using Quotes): Expr[Unit] = {
293293
val formatedArgs = LoggerMacro.formatArgs(args)
294-
if (formatedArgs.length == 1)
294+
if (formatedArgs.lengthIs == 1)
295295
'{if ($underlying.isTraceEnabled($marker)) {
296296
$underlying.trace($marker, $canLogEv.logMessage($message, $a), ${formatedArgs.head})
297297
$canLogEv.afterLog($a)

0 commit comments

Comments
 (0)