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.

Sign up for GitHub

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.7.5 #2792

Merged
merged 3 commits into from
Jul 1, 2023
Merged

Update scalafmt-core to 3.7.5 #2792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f163344
Update scalafmt-core to 3.7.5
scala-steward Jun 30, 2023
d8a77df
Reformat with scalafmt 3.7.5
scala-steward Jun 30, 2023
f8b380e
Add 'Reformat with scalafmt 3.7.5' to .git-blame-ignore-revs
scala-steward Jun 30, 2023
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
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.7.5
d8a77dfb017feae820e38eea0d7b5128b13a737d
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.4"
version = "3.7.5"
maxColumn = 120
align.preset = most
align.multiline = false
Expand Down
3 changes: 2 additions & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions quill-codegen/src/main/scala/io/getquill/codegen/gen/CodeGeneratorComponents.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}
8 changes: 4 additions & 4 deletions quill-engine/src/main/scala/io/getquill/norm/capture/AvoidAliasConflict.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]] {
Expand Down