From 4e133706f2e615c962c622a56e7741c5c17fdd00 Mon Sep 17 00:00:00 2001 From: scala-steward Date: Tue, 3 Sep 2024 00:08:13 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.8.3 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 0788471..e3d837e 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.7.17 +version = 3.8.3 maxColumn = 120 runner.dialect = scala3 fileOverride { From 3f51dc7447fca7c4a49087ff4255387e31ad3b0d Mon Sep 17 00:00:00 2001 From: scala-steward Date: Tue, 3 Sep 2024 00:08:18 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.8.3 Executed command: scalafmt --non-interactive --- .../com.softwaremill.quicklens/LowPriorityImplicits.scala | 5 ++--- .../scala-3/com/softwaremill/quicklens/QuicklensMacros.scala | 4 ++-- .../com/softwaremill/quicklens/test/ExplicitCopyTest.scala | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/quicklens/src/main/scala-2.13+/com.softwaremill.quicklens/LowPriorityImplicits.scala b/quicklens/src/main/scala-2.13+/com.softwaremill.quicklens/LowPriorityImplicits.scala index dccd6f8..c14eac5 100644 --- a/quicklens/src/main/scala-2.13+/com.softwaremill.quicklens/LowPriorityImplicits.scala +++ b/quicklens/src/main/scala-2.13+/com.softwaremill.quicklens/LowPriorityImplicits.scala @@ -4,9 +4,8 @@ import scala.annotation.compileTimeOnly private[quicklens] trait LowPriorityImplicits { - /** - * `QuicklensEach` is in `LowPriorityImplicits` to not conflict with the `QuicklensMapAtFunctor` on `each` calls. - */ + /** `QuicklensEach` is in `LowPriorityImplicits` to not conflict with the `QuicklensMapAtFunctor` on `each` calls. + */ implicit class QuicklensEach[F[_], T](t: F[T])(implicit f: QuicklensFunctor[F, T]) { @compileTimeOnly(canOnlyBeUsedInsideModify("each")) def each: T = sys.error("") diff --git a/quicklens/src/main/scala-3/com/softwaremill/quicklens/QuicklensMacros.scala b/quicklens/src/main/scala-3/com/softwaremill/quicklens/QuicklensMacros.scala index 90f7eac..54684ee 100644 --- a/quicklens/src/main/scala-3/com/softwaremill/quicklens/QuicklensMacros.scala +++ b/quicklens/src/main/scala-3/com/softwaremill/quicklens/QuicklensMacros.scala @@ -174,8 +174,8 @@ object QuicklensMacros { def symbolMethodByNameOrError(sym: Symbol, name: String): Symbol = { sym.methodMember(name) match case List(m) => m - case Nil => symbolAccessorByNameOrError(sym, name) - case _ => report.errorAndAbort(multipleMatchingMethods(sym.name, name)) + case Nil => symbolAccessorByNameOrError(sym, name) + case _ => report.errorAndAbort(multipleMatchingMethods(sym.name, name)) } def termMethodByNameUnsafe(term: Term, name: String): Symbol = { diff --git a/quicklens/src/test/scala-3/com/softwaremill/quicklens/test/ExplicitCopyTest.scala b/quicklens/src/test/scala-3/com/softwaremill/quicklens/test/ExplicitCopyTest.scala index eb7e469..e2a52ac 100644 --- a/quicklens/src/test/scala-3/com/softwaremill/quicklens/test/ExplicitCopyTest.scala +++ b/quicklens/src/test/scala-3/com/softwaremill/quicklens/test/ExplicitCopyTest.scala @@ -15,7 +15,7 @@ class ExplicitCopyTest extends AnyFlatSpec with Matchers { object Vec { def apply(x: Double, y: Double): Vec = new Vec(V(x, y)) {} } - + val vec = Vec(1, 2) val modified = vec.modify(_.x).using(_ + 1) val expected = Vec(2, 2) From 3c03fc56020c243f2d72b86fd69b0d8a336d63de Mon Sep 17 00:00:00 2001 From: scala-steward Date: Tue, 3 Sep 2024 00:08:18 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.3' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index b9ac5b9..45073fc 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -3,3 +3,6 @@ # Scala Steward: Reformat with scalafmt 3.7.17 f3e9d962fa8ceb0db3cec08bac9e4d05635f0908 + +# Scala Steward: Reformat with scalafmt 3.8.3 +3f51dc7447fca7c4a49087ff4255387e31ad3b0d