scala3 fmt

mcanlas · Oct 3, 2023 · bb86821 · bb86821
1 parent 8feaeaa
commit bb86821
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 21 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,6 +1,6 @@
 version = "3.7.14"
 
-runner.dialect = "scala213"
+runner.dialect = "scala213source3"
 
 fileOverride {
   "glob:**.sbt" {
@@ -48,3 +48,5 @@ docstrings.blankFirstLine = yes
 
 includeNoParensInSelectChains = true
 optIn.breakChainOnFirstMethodDot = true
+
+rewrite.scala3.convertToNewSyntax = true
diff --git a/benchmark/src/main/scala/com/htmlism/spawningpool/VectorVsArray.scala b/benchmark/src/main/scala/com/htmlism/spawningpool/VectorVsArray.scala
@@ -2,7 +2,7 @@ package com.htmlism.spawningpool
 
 import scala.concurrent.ExecutionContext.Implicits.global
 
-import com.htmlism.spawningpool.combinatorics._
+import com.htmlism.spawningpool.combinatorics.*
 
 object VectorVsArray extends App {
   Benchmark(

diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,4 @@
-import sbtrelease.ReleaseStateTransformations._
+import sbtrelease.ReleaseStateTransformations.*
 
 val commonSettings = Seq(
   organization       := "com.htmlism",
@@ -7,33 +7,33 @@ val commonSettings = Seq(
 )
 
 lazy val core = Project("spawning-pool-core", file("spawning-pool-core"))
-  .settings(commonSettings: _*)
-  .settings(specs2: _*)
+  .settings(commonSettings*)
+  .settings(specs2*)
   .settings(betterConsole)
 
 lazy val coreAlpha =
   Project("spawning-pool-core-alpha", file("spawning-pool-core-alpha"))
-    .settings(commonSettings: _*)
-    .settings(fs2: _*)
-    .settings(specs2: _*)
+    .settings(commonSettings*)
+    .settings(fs2*)
+    .settings(specs2*)
     .settings(betterConsole)
 
 lazy val coreCats =
   Project("spawning-pool-scalaz", file("spawning-pool-scalaz"))
-    .settings(commonSettings: _*)
+    .settings(commonSettings*)
     .dependsOn(coreAlpha)
 
 lazy val shapelessMutation = Project("spawning-pool-shapeless-mutation", file("spawning-pool-shapeless-mutation"))
-  .settings(commonSettings: _*)
+  .settings(commonSettings*)
   .settings(shapeless)
   .dependsOn(coreAlpha)
 
 lazy val benchmark = project
-  .settings(commonSettings: _*)
+  .settings(commonSettings*)
   .dependsOn(core)
 
 lazy val root = Project("spawning-pool", file("."))
-  .settings(commonSettings: _*)
+  .settings(commonSettings*)
   .aggregate(core, benchmark, coreAlpha)
 
 releaseProcess := Seq(

diff --git a/project/CatsEffectForkPlugin.scala b/project/CatsEffectForkPlugin.scala
@@ -14,7 +14,7 @@ object CatsEffectForkPlugin extends AutoPlugin {
 
   // cats-effect prefers to run in its own main thread
   // https://github.com/typelevel/cats-effect/pull/3774
-  override val buildSettings: Seq[Setting[_]] = Seq(
+  override val buildSettings: Seq[Setting[?]] = Seq(
     fork := true
   )
 }
diff --git a/project/LintingPlugin.scala b/project/LintingPlugin.scala
@@ -1,6 +1,6 @@
-import sbt.Keys._
-import sbt._
-import scalafix.sbt.ScalafixPlugin.autoImport._
+import sbt.Keys.*
+import sbt.*
+import scalafix.sbt.ScalafixPlugin.autoImport.*
 
 object LintingPlugin extends AutoPlugin {
   override def trigger =

diff --git a/spawning-pool-core/src/main/scala/com/htmlism/spawningpool/Generator.scala b/spawning-pool-core/src/main/scala/com/htmlism/spawningpool/Generator.scala
@@ -1,6 +1,6 @@
 package com.htmlism.spawningpool
 
-import com.htmlism.spawningpool.generation._
+import com.htmlism.spawningpool.generation.*
 
 /**
   * A trait that represents a nullary operation for generating chromosomes of `A`.

diff --git a/spawning-pool-core/src/main/scala/com/htmlism/spawningpool/Solver.scala b/spawning-pool-core/src/main/scala/com/htmlism/spawningpool/Solver.scala
@@ -1,8 +1,8 @@
 package com.htmlism.spawningpool
 
 import scala.annotation.tailrec
-import scala.concurrent._
-import scala.concurrent.duration._
+import scala.concurrent.*
+import scala.concurrent.duration.*
 
 object Solver {
   val DEFAULT_POPULATION_SIZE  = PositiveCount(50)
@@ -82,7 +82,7 @@ class Solver[A, B](
     mutationRate: Double          = Solver.DEFAULT_MUTATION_RATE,
     generations: PositiveCount    = Solver.DEFAULT_GENERATION_COUNT
 )(implicit evolver: Evolver[A], ordering: Ordering[B]) {
-  import com.htmlism.spawningpool.Solver._
+  import com.htmlism.spawningpool.Solver.*
 
   type Population = Vector[A]
   type Solutions  = Set[A]

diff --git a/spawning-pool-core/src/test/scala/com/htmlism/spawningpool/SolverSpec.scala b/spawning-pool-core/src/test/scala/com/htmlism/spawningpool/SolverSpec.scala
@@ -2,7 +2,7 @@ package com.htmlism.spawningpool
 
 import org.specs2.mutable.Specification
 
-import com.htmlism.spawningpool.Solver._
+import com.htmlism.spawningpool.Solver.*
 
 class SolverSpec extends Specification {
   "The solver" should {