From f16334481b90952298dd2b06f2a42a626f47ca22 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 30 Jun 2023 17:41:12 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.7.5 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index c629358471..5e022422b9 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.4" +version = "3.7.5" maxColumn = 120 align.preset = most align.multiline = false From d8a77dfb017feae820e38eea0d7b5128b13a737d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 30 Jun 2023 17:42:13 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.7.5 Executed command: scalafmt --non-interactive --- build.sbt | 3 ++- .../io/getquill/codegen/gen/CodeGeneratorComponents.scala | 3 +-- .../io/getquill/norm/capture/AvoidAliasConflict.scala | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 470bb6c633..3e60048dec 100644 --- a/build.sbt +++ b/build.sbt @@ -799,7 +799,8 @@ lazy val basicSettings = excludeFilterSettings ++ Seq( "-Ywarn-dead-code", "-Ywarn-numeric-widen", "-Ywarn-value-discard", - "-Ypatmat-exhaust-depth", "40" + "-Ypatmat-exhaust-depth", + "40" ), scalacOptions ++= { CrossVersion.partialVersion(scalaVersion.value) match { diff --git a/quill-codegen/src/main/scala/io/getquill/codegen/gen/CodeGeneratorComponents.scala b/quill-codegen/src/main/scala/io/getquill/codegen/gen/CodeGeneratorComponents.scala index fbca33fdfc..df8d624859 100644 --- a/quill-codegen/src/main/scala/io/getquill/codegen/gen/CodeGeneratorComponents.scala +++ b/quill-codegen/src/main/scala/io/getquill/codegen/gen/CodeGeneratorComponents.scala @@ -63,8 +63,7 @@ trait CodeGeneratorComponents extends HasBasicMeta with QuerySchemaNaming { /** * Take the schema of a table and convert it to something a object/package - * etc... can actually be named as - * i.e. a namespace. + * etc... can actually be named as i.e. a namespace. */ def namespacer: Namespacer[TableMeta] } diff --git a/quill-engine/src/main/scala/io/getquill/norm/capture/AvoidAliasConflict.scala b/quill-engine/src/main/scala/io/getquill/norm/capture/AvoidAliasConflict.scala index 4b1f3e53e2..5b9424ca36 100644 --- a/quill-engine/src/main/scala/io/getquill/norm/capture/AvoidAliasConflict.scala +++ b/quill-engine/src/main/scala/io/getquill/norm/capture/AvoidAliasConflict.scala @@ -52,10 +52,10 @@ import scala.collection.immutable.Set * of the form x[0-9]+. Since `AvoidAliasConflict` typically runs not on the * entire Ast but the sub-parts of it used by normalizations, making temporary * aliases permanent cannot be done in these sub-parts because the 'state' of - * this transformation is not fully know - * i.e. because aliases of outer clauses may not be present. For this reason, - * this transformation is specifically called once from the top-level inside - * `SqlNormalize` at the very end of the transformation pipeline. + * this transformation is not fully know i.e. because aliases of outer clauses + * may not be present. For this reason, this transformation is specifically + * called once from the top-level inside `SqlNormalize` at the very end of the + * transformation pipeline. */ private[getquill] case class AvoidAliasConflict(state: Set[IdentName], detemp: Boolean, traceConfig: TraceConfig) extends StatefulTransformer[Set[IdentName]] { From f8b380e4fcc56b957835c2dde3ddd02befb7c168 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 30 Jun 2023 17:42:13 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.7.5' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000000..741775cc0c --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.7.5 +d8a77dfb017feae820e38eea0d7b5128b13a737d