diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index e0b7dd213..a4e74dc60 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.8.4 ee851aa4e36b33e8971b66b2b3aef8b4e28d6854 + +# Scala Steward: Reformat with scalafmt 3.9.10 +43741c1f9e98654f83ebba1499f560b83ba7d591 diff --git a/.scalafmt.conf b/.scalafmt.conf index f95bd614f..f03963d17 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.8.6" +version = "3.9.10" runner.dialect = "scala3" maxColumn = 140 diff --git a/lettuce-pureconfig/src/main/scala-2/com/avast/sst/lettuce/pureconfig/ConfigReaders.scala b/lettuce-pureconfig/src/main/scala-2/com/avast/sst/lettuce/pureconfig/ConfigReaders.scala index d524aa40c..358369d0e 100644 --- a/lettuce-pureconfig/src/main/scala-2/com/avast/sst/lettuce/pureconfig/ConfigReaders.scala +++ b/lettuce-pureconfig/src/main/scala-2/com/avast/sst/lettuce/pureconfig/ConfigReaders.scala @@ -20,7 +20,7 @@ trait ConfigReaders { case "DEFAULT" => DisconnectedBehavior.DEFAULT.asRight case "ACCEPT_COMMANDS" => DisconnectedBehavior.ACCEPT_COMMANDS.asRight case "REJECT_COMMANDS" => DisconnectedBehavior.REJECT_COMMANDS.asRight - case unknown => + case unknown => CannotConvert( unknown, "DisconnectedBehavior", diff --git a/lettuce-pureconfig/src/main/scala-3/com/avast/sst/lettuce/pureconfig/ConfigReaders.scala b/lettuce-pureconfig/src/main/scala-3/com/avast/sst/lettuce/pureconfig/ConfigReaders.scala index 2464d5ce2..12c6c6303 100644 --- a/lettuce-pureconfig/src/main/scala-3/com/avast/sst/lettuce/pureconfig/ConfigReaders.scala +++ b/lettuce-pureconfig/src/main/scala-3/com/avast/sst/lettuce/pureconfig/ConfigReaders.scala @@ -17,7 +17,7 @@ trait ConfigReaders { case "DEFAULT" => DisconnectedBehavior.DEFAULT.asRight case "ACCEPT_COMMANDS" => DisconnectedBehavior.ACCEPT_COMMANDS.asRight case "REJECT_COMMANDS" => DisconnectedBehavior.REJECT_COMMANDS.asRight - case unknown => + case unknown => CannotConvert( unknown, "DisconnectedBehavior", diff --git a/pureconfig/src/main/scala/com/avast/sst/pureconfig/util/Toggle.scala b/pureconfig/src/main/scala/com/avast/sst/pureconfig/util/Toggle.scala index b01f48f82..fbd57ad97 100644 --- a/pureconfig/src/main/scala/com/avast/sst/pureconfig/util/Toggle.scala +++ b/pureconfig/src/main/scala/com/avast/sst/pureconfig/util/Toggle.scala @@ -90,7 +90,7 @@ object Toggle { override def empty: Toggle[A] = Disabled override def combine(x: Toggle[A], y: Toggle[A]): Toggle[A] = x match { - case Disabled => y + case Disabled => y case Enabled(a) => y match { case Disabled => x @@ -102,7 +102,7 @@ object Toggle { class ToggleOrder[A](implicit A: Order[A]) extends Order[Toggle[A]] { override def compare(x: Toggle[A], y: Toggle[A]): Int = x match { - case Disabled => if (y.isEmpty) 0 else -1 + case Disabled => if (y.isEmpty) 0 else -1 case Enabled(a) => y match { case Disabled => 1