Merge pull request #567 from scala-steward/update/series/1.x/scalafmt…

…-core-3.3.0 Update scalafmt-core to 3.3.0 in series/1.x
typelevel · Dec 30, 2021 · 641aef3 · 641aef3
2 parents 37d6cea + 3cc1e8a
commit 641aef3
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 16 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,7 +1,7 @@
 # tune this file as appropriate to your style!  see:
 # https://scalameta.org/scalafmt/docs/configuration.html
 
-version = 2.7.5
+version = 3.3.0
 
 maxColumn = 100
 
@@ -20,9 +20,11 @@ align {
   tokens = ["%", "%%"]
 }
 
-docstrings = JavaDoc
+docstrings.style = Asterisk
 
 rewrite {
   rules = [SortImports, RedundantBraces]
   redundantBraces.maxLines = 1
 }
+
+runner.dialect = "scala213source3"
diff --git a/core/shared/src/main/scala/org/typelevel/log4cats/extras/Translate.scala b/core/shared/src/main/scala/org/typelevel/log4cats/extras/Translate.scala
@@ -20,8 +20,7 @@ import org.typelevel.log4cats._
 import cats._
 
 /**
- * Allows for mapK or algebraic higher kinded
- * transformations
+ * Allows for mapK or algebraic higher kinded transformations
  */
 object Translate {
 

diff --git a/core/shared/src/main/scala/org/typelevel/log4cats/extras/WriterTLogger.scala b/core/shared/src/main/scala/org/typelevel/log4cats/extras/WriterTLogger.scala
@@ -22,11 +22,10 @@ import cats.syntax.all._
 import org.typelevel.log4cats._
 
 /**
- * >>> WARNING READ BEFORE USAGE! <<<
- * This logger will NOT log anything if `F` fails!
+ * >>> WARNING READ BEFORE USAGE! <<< This logger will NOT log anything if `F` fails!
  *
- * Running the `WriterT` instance will yield a value of type `F[(G[LogMessage], A)]`.
- * As a result, the logged messages can be materialized if and only `F` succeeds.
+ * Running the `WriterT` instance will yield a value of type `F[(G[LogMessage], A)]`. As a result,
+ * the logged messages can be materialized if and only `F` succeeds.
  */
 object WriterTLogger {
   def apply[F[_]: Applicative, G[_]: Alternative](

diff --git a/slf4j/src/main/scala-2/org/typelevel/log4cats/slf4j/internal/GetLoggerMacros.scala b/slf4j/src/main/scala-2/org/typelevel/log4cats/slf4j/internal/GetLoggerMacros.scala
@@ -38,10 +38,10 @@ import scala.reflect.macros.blackbox
 /**
  * Macros that support the logging system.
  *
- *  See for handling call-by-name-parameters in macros
- *  https://issues.scala-lang.org/browse/SI-5778
+ * See for handling call-by-name-parameters in macros https://issues.scala-lang.org/browse/SI-5778
  *
- * @author Sarah Gerweck <sarah@atscale.com>
+ * @author
+ *   Sarah Gerweck <sarah@atscale.com>
  */
 private[slf4j] class GetLoggerMacros(val c: blackbox.Context) {
 

diff --git a/slf4j/src/main/scala/org/typelevel/log4cats/slf4j/internal/Slf4jLoggerInternal.scala b/slf4j/src/main/scala/org/typelevel/log4cats/slf4j/internal/Slf4jLoggerInternal.scala
@@ -48,8 +48,9 @@ private[slf4j] object Slf4jLoggerInternal {
       } MDC.put(k, v)
 
       try logging()
-      finally if (backup eq null) MDC.clear()
-      else MDC.setContextMap(backup)
+      finally
+        if (backup eq null) MDC.clear()
+        else MDC.setContextMap(backup)
     }
 
     isEnabled.ifM(

diff --git a/slf4j/src/test/scala/org/typelevel/log4cats/slf4j/internal/Slf4jLoggerInternalSuite.scala b/slf4j/src/test/scala/org/typelevel/log4cats/slf4j/internal/Slf4jLoggerInternalSuite.scala
@@ -79,10 +79,10 @@ class Slf4jLoggerInternalSuite extends CatsEffectSuite {
 
     import dirtyStuff._
 
-    //logging happens here
+    // logging happens here
     val loggerThread = namedSingleThreadExecutionContext("my-thread-1")
 
-    //restoring context would run here if IO.bracket was used
+    // restoring context would run here if IO.bracket was used
     val finalizerThread = namedSingleThreadExecutionContext("my-thread-2")
 
     val mainThread = namedSingleThreadExecutionContext("main-thread")

diff --git a/testing/shared/src/main/scala/org/typelevel/log4cats/testing/TestingLogger.scala b/testing/shared/src/main/scala/org/typelevel/log4cats/testing/TestingLogger.scala
@@ -16,7 +16,7 @@
 
 package org.typelevel.log4cats.testing
 
-import org.typelevel.log4cats.{SelfAwareLogger}
+import org.typelevel.log4cats.SelfAwareLogger
 import cats.effect.Sync
 import cats.implicits._
 import java.util.concurrent.atomic.AtomicReference