Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Update scalafmt-core to 3.8.4 #1067

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
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
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.7.10
9bcedec20a4fc7adedce8aea4921c05b0c7acfa4

# Scala Steward: Reformat with scalafmt 3.8.4
fe6afbbbb23fdc643736503bf55e810b60f3ecf4
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.1"
version = "3.8.4"
maxColumn = 120
align.preset = most
continuationIndent.defnSite = 2
Expand Down
12 changes: 9 additions & 3 deletions core/jvm/src/main/scala/zio/sql/select/Read.scala
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,9 @@ object Read {
expr3: Expr[F3, Source, Any],
expr4: Expr[F4, Source, Any],
expr5: Expr[F5, Source, Any]
)(implicit verify: GroupByLike[F, F1 with F2 with F3 with F4 with F5]): Subselect.WithGroupByF[
)(implicit
verify: GroupByLike[F, F1 with F2 with F3 with F4 with F5]
): Subselect.WithGroupByF[
F,
Repr,
Source,
Expand Down Expand Up @@ -284,7 +286,9 @@ object Read {
expr4: Expr[F4, Source, Any],
expr5: Expr[F5, Source, Any],
expr6: Expr[F6, Source, Any]
)(implicit verify: GroupByLike[F, F1 with F2 with F3 with F4 with F5 with F6]): Subselect.WithGroupByF[
)(implicit
verify: GroupByLike[F, F1 with F2 with F3 with F4 with F5 with F6]
): Subselect.WithGroupByF[
F,
Repr,
Source,
Expand Down Expand Up @@ -315,7 +319,9 @@ object Read {
expr5: Expr[F5, Source, Any],
expr6: Expr[F6, Source, Any],
expr7: Expr[F7, Source, Any]
)(implicit verify: GroupByLike[F, F1 with F2 with F3 with F4 with F5 with F6 with F7]): Subselect.WithGroupByF[
)(implicit
verify: GroupByLike[F, F1 with F2 with F3 with F4 with F5 with F6 with F7]
): Subselect.WithGroupByF[
F,
Repr,
Source,
Expand Down
4 changes: 2 additions & 2 deletions core/jvm/src/main/scala/zio/sql/typetag/TypeTag.scala
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ object TypeTag {
}

// TODO get TypeTag of A available out of Schema[A] and derive typetag from Schema.Transform
case _: Schema.Transform[_, _, _] => None
case _ => None
case _: Schema.Transform[_, _, _] => None
case _ => None
}
}

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion macros/src/main/scala-2/zio/sql/macros/insertlike.scala
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ object InsertLike {
if (toInsert.typeSymbol.asClass.isCaseClass) {
toInsert.dealias match {
// for case classes
case TypeRef(_, _, types) if types == Nil =>
case TypeRef(_, _, types) if types == Nil =>
toInsert.decls.sorted.collect {
case p: TermSymbol if p.isCaseAccessor && !p.isMethod =>
p.typeSignature match {
Expand Down
4 changes: 2 additions & 2 deletions mysql/src/main/scala/zio/sql/mysql/MysqlRenderModule.scala
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ trait MysqlRenderModule extends MysqlSqlModule { self =>
render(
lit.value.asInstanceOf[Chunk[Byte]].map("""\%02X""" format _).mkString("x'", "", "'")
) // todo fix `cast` infers correctly but map doesn't work for some reason
case tt @ TChar =>
case tt @ TChar =>
render("'", tt.cast(lit.value), "'") // todo is this the same as a string? fix escaping
case tt @ TInstant =>
render("TIMESTAMP '", tt.cast(lit.value), "'")
Expand Down Expand Up @@ -448,7 +448,7 @@ trait MysqlRenderModule extends MysqlSqlModule { self =>
render(lit.value)
case TString =>
render("'", lit.value, "'") // todo fix escaping
case _ =>
case _ =>
render(lit.value) // todo fix add TypeTag.Nullable[_] =>
}
}
Expand Down
Loading