Skip to content

Commit

Permalink
Merge pull request #1239 from xuwei-k/scalafmt-convertToNewSyntax
Browse files Browse the repository at this point in the history
enforce new wildcard syntax
  • Loading branch information
fthomas authored Jan 2, 2024
2 parents d208369 + 3aa6b1d commit 2e76bc5
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 13 deletions.
5 changes: 5 additions & 0 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,10 @@ rewriteTokens {
fileOverride {
"glob:**/src/*/scala-3.0+/**" {
runner.dialect = scala3
rewrite.scala3.convertToNewSyntax = false
}
}
rewrite.scala3.convertToNewSyntax = true
runner.dialectOverride.allowAsForImportRename = false
runner.dialectOverride.allowStarWildcardImport = false
runner.dialectOverride.allowPostfixStarVarargSplices = false
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ lazy val moduleCrossSettings = Def.settings(
commonSettings
)

def moduleJvmSettings(name: String): Seq[Def.Setting[_]] =
def moduleJvmSettings(name: String): Seq[Def.Setting[?]] =
Def.settings(
scalaVersion := Scala_2_13,
javaOptions ++= Seq("-Duser.language=en"),
Expand All @@ -385,7 +385,7 @@ def moduleJvmSettings(name: String): Seq[Def.Setting[_]] =
}
)

def moduleJsSettings(name: String): Seq[Def.Setting[_]] =
def moduleJsSettings(name: String): Seq[Def.Setting[?]] =
Def.settings(
scalaVersion := Scala_2_13,
crossScalaVersions := moduleCrossScalaVersionsMatrix(name, JSPlatform),
Expand All @@ -403,7 +403,7 @@ def moduleJsSettings(name: String): Seq[Def.Setting[_]] =
}
)

def moduleNativeSettings(name: String): Seq[Def.Setting[_]] =
def moduleNativeSettings(name: String): Seq[Def.Setting[?]] =
Def.settings(
crossScalaVersions := moduleCrossScalaVersionsMatrix(name, NativePlatform),
doctestGenTests := Seq.empty,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ object boolean extends BooleanInference0 {
implicit def oneOfHConsValidate[T, PH, RH, PT <: HList, RT <: HList](implicit
vh: Validate.Aux[T, PH, RH],
vt: Validate.Aux[T, OneOf[PT], OneOf[RT]],
toList: ToList[RT, Result[_]]
toList: ToList[RT, Result[?]]
): Validate.Aux[T, OneOf[PH :: PT], OneOf[vh.Res :: RT]] =
new Validate[T, OneOf[PH :: PT]] {
override type R = OneOf[vh.Res :: RT]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ object collection extends CollectionInference {
}

object Empty {
implicit def emptyValidate[T](implicit ev: T => Iterable[_]): Validate.Plain[T, Empty] =
implicit def emptyValidate[T](implicit ev: T => Iterable[?]): Validate.Plain[T, Empty] =
Validate.fromPredicate(t => ev(t).isEmpty, t => s"isEmpty($t)", Empty())
}

Expand Down Expand Up @@ -254,7 +254,7 @@ object collection extends CollectionInference {
object Size {
implicit def sizeValidate[T, P, RP](implicit
v: Validate.Aux[Int, P, RP],
ev: T => Iterable[_]
ev: T => Iterable[?]
): Validate.Aux[T, Size[P], Size[v.Res]] =
new Validate[T, Size[P]] {
override type R = Size[v.Res]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ object Resources {
val Left = "Left"
val Right = "Right"

def predicateResult(r: Result[_]): String =
def predicateResult(r: Result[?]): String =
s"$Predicate ${toLowerCase(r)}"

def predicateResultDetail(r: Result[_], detail: String): String =
def predicateResultDetail(r: Result[?], detail: String): String =
s"${predicateResult(r)}: $detail"

def predicateResultDetailDot(r: Result[_], detail: String): String =
def predicateResultDetailDot(r: Result[?], detail: String): String =
s"${predicateResultDetail(r, detail)}."

def predicateTakingResultDetail(taking: String, r: Result[_], detail: String): String =
def predicateTakingResultDetail(taking: String, r: Result[?], detail: String): String =
s"$Predicate taking $taking ${toLowerCase(r)}: $detail"

def showExprEmptyCollection: String =
Expand All @@ -33,10 +33,10 @@ object Resources {
def showResultEmptyCollection: String =
s"$Predicate $failed: empty collection."

def namePredicateResult(name: String, r: Result[_]): String =
def namePredicateResult(name: String, r: Result[?]): String =
s"$name $predicate ${toLowerCase(r)}"

def namePredicateResultMessage(name: String, r: Result[_], maybeThrowable: Try[_]): String = {
def namePredicateResultMessage(name: String, r: Result[?], maybeThrowable: Try[?]): String = {
val suffix = maybeThrowable match {
case Success(_) => "."
case Failure(e) => s": ${e.getMessage}"
Expand All @@ -47,7 +47,7 @@ object Resources {
def isValidName[T](name: String, t: T): String =
s"""isValid$name("$t")"""

def toLowerCase(r: Result[_]): String =
def toLowerCase(r: Result[?]): String =
r.morph(passed, failed)

// Not
Expand Down

0 comments on commit 2e76bc5

Please sign in to comment.