Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scalafmt-core to 3.8.6 #3180

Merged
merged 4 commits into from
Feb 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ d8a77dfb017feae820e38eea0d7b5128b13a737d

# Scala Steward: Reformat with scalafmt 3.8.3
1b7c658737faa53ec506fb403892320773282488

# Scala Steward: Reformat with scalafmt 3.8.6
c9094fe152787d45d372562fe6743e4deaaea82d
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.8.3"
version = "3.8.6"
maxColumn = 240
align.preset = most
align.multiline = false
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ lazy val `quill-util` =
.settings(
Test / fork := true,
libraryDependencies ++= Seq(
("org.scalameta" %% "scalafmt-core" % "3.8.3")
("org.scalameta" %% "scalafmt-core" % "3.8.6")
.excludeAll(
({
if (isScala3)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ sealed trait CodegenTestCases {
def schemaMakerCoordinates(dbPrefix: ConfigPrefix) = SchemaMakerCoordinates(dbPrefix, naming, schemaConfig)

def generateWithSchema(dbPrefix: ConfigPrefix, basePath: String): Future[Seq[Path]] =
SchemaMaker.withContext(schemaMakerCoordinates(dbPrefix))({
SchemaMaker.withContext(schemaMakerCoordinates(dbPrefix))(
generate(dbPrefix, basePath)
})
)

protected def generate(dbPrefix: ConfigPrefix, basePath: String): Future[Seq[Path]]
protected def pathList(implicit dbPrefix: ConfigPrefix) =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ object DefaultNodeCatalog extends NodeCatalog {

override def lookup(cls: ClassTag[_]): DagNode = nodeCatalogNodes
.find(_.cls == cls)
.getOrElse({
.getOrElse {
logger.warn(s"Could not find type hierarchy node for: ${cls} Must assume it's a string")
StringNode
})
}
}

package object dag {
Expand Down
2 changes: 1 addition & 1 deletion quill-core/src/main/scala/zio/logging/extensions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ object extensions {
*
* 1. We need to copy the function as it's private and we can't access it.
* 2. We wrapped the code we copied into a ZIO to be sure to correctly
* close the writer.
* close the writer.
*
* See:
* - https://github.com/zio/zio-logging/blob/v2.1.14/core/shared/src/main/scala/zio/logging/package.scala#L470-L491
Expand Down
2 changes: 1 addition & 1 deletion quill-core/src/test/scala/io/getquill/MirrorContexts.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import scala.util.{Failure, Try}

object MirrorContexts {

object testContext extends TestMirrorContextTemplate(MirrorIdiom, Literal) with TestEntities
object testContext extends TestMirrorContextTemplate(MirrorIdiom, Literal) with TestEntities
object testAsyncContext extends AsyncMirrorContext(MirrorIdiom, Literal) with TestEntities {

// hack to avoid Await.result since scala.js doesn't support it
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -396,8 +396,7 @@ class SqlActionMacroSpec extends Spec {
.insertValue(lift(TestEntity("s", 0, 1L, None, true)))
.returningGenerated(r =>
(query[Dummy]
.filter(r => r.i == r.i /* always true since r overridden! */
)
.filter(r => r.i == r.i /* always true since r overridden! */ )
.map(r => r.i)
.max)
)
Expand Down Expand Up @@ -666,8 +665,7 @@ class SqlActionMacroSpec extends Spec {
.insertValue(lift(TestEntity("s", 0, 1L, None, true)))
.returning(r =>
(query[Dummy]
.filter(r => r.i == r.i /* always true since r overridden! */
)
.filter(r => r.i == r.i /* always true since r overridden! */ )
.map(r => r.i)
.max)
)
Expand Down Expand Up @@ -903,8 +901,7 @@ class SqlActionMacroSpec extends Spec {
.updateValue(lift(TestEntity("s", 0, 1L, None, true)))
.returning(r =>
(query[Dummy]
.filter(r => r.i == r.i /* always true since r overridden! */
)
.filter(r => r.i == r.i /* always true since r overridden! */ )
.map(r => r.i)
.max)
)
Expand Down Expand Up @@ -1129,8 +1126,7 @@ class SqlActionMacroSpec extends Spec {
qr1.delete
.returning(r =>
(query[Dummy]
.filter(r => r.i == r.i /* always true since r overridden! */
)
.filter(r => r.i == r.i /* always true since r overridden! */ )
.map(r => r.i)
.max)
)
Expand Down
Loading