Update scalafmt

argonaut-io · Aug 27, 2024 · 33fe93c · 33fe93c
1 parent 6c29bb4
commit 33fe93c
Show file tree

Hide file tree

Showing 88 changed files with 266 additions and 272 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -20,13 +20,7 @@ newlines.topLevelStatementBlankLines = [
   }
 ]
 project.layout = StandardConvention
-fileOverride {
-  "glob:**/src/**/scala-3/**" {
-    rewrite.scala3.convertToNewSyntax = false
-  }
-}
 rewrite.scala3.convertToNewSyntax = true
 rewrite.scala3.newSyntax.control = false
 runner.dialectOverride.allowSignificantIndentation = false
-runner.dialectOverride.allowAsForImportRename = false
-runner.dialectOverride.allowStarWildcardImport = false
+runner.dialectOverride.allowUnderscoreAsTypePlaceholder = false
diff --git a/argonaut-benchmark/src/main/scala/argonaut/benchmark/CaliperBenchmark.scala b/argonaut-benchmark/src/main/scala/argonaut/benchmark/CaliperBenchmark.scala
@@ -1,10 +1,10 @@
 package argonaut.benchmark
 
-import com.google.caliper._
-import argonaut._
-import Argonaut._
+import com.google.caliper.*
+import argonaut.*
+import Argonaut.*
 import com.fasterxml.jackson.core.TreeNode
-import com.fasterxml.jackson.core.{JsonFactory => JacksonJsonFactory}
+import com.fasterxml.jackson.core.JsonFactory as JacksonJsonFactory
 
 // Stolen conveniently from
 // https://github.com/sirthias/scala-benchmarking-template/blob/master/src/main/scala/org/example/SimpleScalaBenchmark.scala.

diff --git a/argonaut-benchmark/src/main/scala/argonaut/benchmark/ParserBench.scala b/argonaut-benchmark/src/main/scala/argonaut/benchmark/ParserBench.scala
@@ -1,7 +1,7 @@
 package argonaut
 package benchmark
 
-import Argonaut._
+import Argonaut.*
 
 object ParserBench {
   def parse(json: String, count: Int) = {

diff --git a/argonaut-cats/shared/src/main/scala/argonaut/ContextCats.scala b/argonaut-cats/shared/src/main/scala/argonaut/ContextCats.scala
@@ -1,11 +1,11 @@
 package argonaut
 
-import ContextElementCats._
-import JsonCats._
-import cats._
-import instances.all._
-import syntax.eq._
-import syntax.show._
+import ContextElementCats.*
+import JsonCats.*
+import cats.*
+import instances.all.*
+import syntax.eq.*
+import syntax.show.*
 
 object ContextCats extends ContextCatss
 

diff --git a/argonaut-cats/shared/src/main/scala/argonaut/CursorCats.scala b/argonaut-cats/shared/src/main/scala/argonaut/CursorCats.scala
@@ -1,13 +1,13 @@
 package argonaut
 
-import ContextCats._
-import JsonCats._
-import JsonObjectCats._
-import cats._
-import instances.list._
-import instances.string._
-import syntax.eq._
-import syntax.show._
+import ContextCats.*
+import JsonCats.*
+import JsonObjectCats.*
+import cats.*
+import instances.list.*
+import instances.string.*
+import syntax.eq.*
+import syntax.show.*
 
 object CursorCats extends CursorCatss {}
 

diff --git a/argonaut-cats/shared/src/main/scala/argonaut/CursorHistoryCats.scala b/argonaut-cats/shared/src/main/scala/argonaut/CursorHistoryCats.scala
@@ -1,9 +1,9 @@
 package argonaut
 
-import CursorOpCats._
-import cats._
-import instances.list._
-import syntax.eq._
+import CursorOpCats.*
+import cats.*
+import instances.list.*
+import syntax.eq.*
 
 object CursorHistoryCats extends CursorHistoryCatss
 

diff --git a/argonaut-cats/shared/src/main/scala/argonaut/CursorOpCats.scala b/argonaut-cats/shared/src/main/scala/argonaut/CursorOpCats.scala
@@ -1,8 +1,8 @@
 package argonaut
 
-import CursorOpElementCats._
-import cats._
-import syntax.show._
+import CursorOpElementCats.*
+import cats.*
+import syntax.show.*
 
 object CursorOpCats extends CursorOpCatss {}
 

diff --git a/argonaut-cats/shared/src/main/scala/argonaut/CursorOpElementCats.scala b/argonaut-cats/shared/src/main/scala/argonaut/CursorOpElementCats.scala
@@ -1,6 +1,6 @@
 package argonaut
 
-import cats._
+import cats.*
 
 object CursorOpElementCats extends CursorOpElementCatss
 

diff --git a/argonaut-cats/shared/src/main/scala/argonaut/DecodeJsonCats.scala b/argonaut-cats/shared/src/main/scala/argonaut/DecodeJsonCats.scala
@@ -1,6 +1,6 @@
 package argonaut
 
-import cats.data._
+import cats.data.*
 
 object DecodeJsonCats extends DecodeJsonCatss {}
 

diff --git a/argonaut-cats/shared/src/main/scala/argonaut/DecodeResultCats.scala b/argonaut-cats/shared/src/main/scala/argonaut/DecodeResultCats.scala
@@ -1,12 +1,12 @@
 package argonaut
 
-import CursorHistoryCats._
-import cats._
-import instances.tuple._
-import instances.either._
-import instances.string._
-import instances.eq._
-import syntax.contravariant._
+import CursorHistoryCats.*
+import cats.*
+import instances.tuple.*
+import instances.either.*
+import instances.string.*
+import instances.eq.*
+import syntax.contravariant.*
 
 object DecodeResultCats extends DecodeResultCatss {}
 

diff --git a/argonaut-cats/shared/src/main/scala/argonaut/EncodeJsonCats.scala b/argonaut-cats/shared/src/main/scala/argonaut/EncodeJsonCats.scala
@@ -1,8 +1,8 @@
 package argonaut
 
-import Argonaut._
-import cats._
-import data._
+import Argonaut.*
+import cats.*
+import data.*
 
 object EncodeJsonCats extends EncodeJsonCatss {}
 

diff --git a/argonaut-cats/shared/src/main/scala/argonaut/JsonCats.scala b/argonaut-cats/shared/src/main/scala/argonaut/JsonCats.scala
@@ -1,10 +1,10 @@
 package argonaut
 
-import JsonNumberCats._
-import JsonObjectCats._
-import cats._
-import instances.list._
-import syntax.eq._
+import JsonNumberCats.*
+import JsonObjectCats.*
+import cats.*
+import instances.list.*
+import syntax.eq.*
 
 object JsonCats extends JsonCatss {}
 

diff --git a/argonaut-cats/shared/src/main/scala/argonaut/JsonNumberCats.scala b/argonaut-cats/shared/src/main/scala/argonaut/JsonNumberCats.scala
@@ -1,6 +1,6 @@
 package argonaut
 
-import cats._
+import cats.*
 
 object JsonNumberCats {
   implicit val JsonNumberEq: Eq[JsonNumber] =

diff --git a/argonaut-cats/shared/src/main/scala/argonaut/JsonObjectCats.scala b/argonaut-cats/shared/src/main/scala/argonaut/JsonObjectCats.scala
@@ -1,10 +1,10 @@
 package argonaut
 
-import Json._
-import JsonObject._
-import cats._
-import syntax.foldable._
-import syntax.functor._
+import Json.*
+import JsonObject.*
+import cats.*
+import syntax.foldable.*
+import syntax.functor.*
 
 object JsonObjectCats extends JsonObjectCatss {
   def from[F[_]: Foldable](f: F[(JsonField, Json)]): JsonObject = {

diff --git a/argonaut-cats/shared/src/main/scala/argonaut/PrettyParamsCats.scala b/argonaut-cats/shared/src/main/scala/argonaut/PrettyParamsCats.scala
@@ -1,6 +1,6 @@
 package argonaut
 
-import cats._
+import cats.*
 
 object PrettyParamsCats extends PrettyParamsCatss
 

diff --git a/argonaut-cats/shared/src/test/scala/argonaut/CursorHistoryCatsSpecification.scala b/argonaut-cats/shared/src/test/scala/argonaut/CursorHistoryCatsSpecification.scala
@@ -1,8 +1,8 @@
 package argonaut
 
 import cats.kernel.laws.discipline.MonoidTests
-import arbitrary._
-import CursorHistoryCats._
+import arbitrary.*
+import CursorHistoryCats.*
 import org.typelevel.discipline.specs2.Discipline
 
 /**

diff --git a/argonaut-cats/shared/src/test/scala/argonaut/DecodeResultCatsSpecification.scala b/argonaut-cats/shared/src/test/scala/argonaut/DecodeResultCatsSpecification.scala
@@ -1,10 +1,10 @@
 package argonaut
 
-import arbitrary._
-import DecodeResultCats._
+import arbitrary.*
+import DecodeResultCats.*
 import cats.laws.discipline.MonadTests
-import org.scalacheck._
-import org.scalacheck.Arbitrary._
+import org.scalacheck.*
+import org.scalacheck.Arbitrary.*
 import org.typelevel.discipline.specs2.Discipline
 
 /**

diff --git a/argonaut-cats/shared/src/test/scala/argonaut/EncodeJsonCatsSpecification.scala b/argonaut-cats/shared/src/test/scala/argonaut/EncodeJsonCatsSpecification.scala
@@ -1,8 +1,8 @@
 package argonaut
 
-import org.scalacheck._
-import org.scalacheck.Arbitrary._
-import org.scalacheck.Prop._
+import org.scalacheck.*
+import org.scalacheck.Arbitrary.*
+import org.scalacheck.Prop.*
 
 /**
   * Created by luissanchez on 27/01/2016.

diff --git a/argonaut-cats/shared/src/test/scala/argonaut/JsonObjectCatsSpecification.scala b/argonaut-cats/shared/src/test/scala/argonaut/JsonObjectCatsSpecification.scala
@@ -1,8 +1,8 @@
 package argonaut
 
-import argonaut.Data._
-import argonaut.JsonObjectCats._
-import cats.syntax.show._
+import argonaut.Data.*
+import argonaut.JsonObjectCats.*
+import cats.syntax.show.*
 
 object JsonObjectCatsSpecification extends ArgonautSpec {
   def is = s2"""

diff --git a/argonaut-cats/shared/src/test/scala/argonaut/arbitrary.scala b/argonaut-cats/shared/src/test/scala/argonaut/arbitrary.scala
@@ -1,7 +1,7 @@
 package argonaut
 
-import org.scalacheck._
-import org.scalacheck.Gen._
+import org.scalacheck.*
+import org.scalacheck.Gen.*
 
 /**
   * Created by luissanchez on 27/01/2016.

diff --git a/argonaut-jawn/shared/src/test/scala/argonaut/JawnParserSpecification.scala b/argonaut-jawn/shared/src/test/scala/argonaut/JawnParserSpecification.scala
@@ -1,10 +1,10 @@
 package argonaut
 
-import argonaut.TestCompat._
+import argonaut.TestCompat.*
 import scala.util.Try
 import org.scalacheck.Arbitrary
 import org.scalacheck.Arbitrary.arbitrary
-import Argonaut._
+import Argonaut.*
 
 object JawnParserSpecification {
   case class Example(a: Int, b: Long, c: Double)
@@ -22,7 +22,7 @@ object JawnParserSpecification {
 }
 
 class JawnParserSpecification extends ArgonautSpec {
-  import JawnParserSpecification._
+  import JawnParserSpecification.*
   import JawnParser.facade
 
   def is = s2"""

diff --git a/argonaut-monocle/shared/src/main/scala/argonaut/JsonMonocle.scala b/argonaut-monocle/shared/src/main/scala/argonaut/JsonMonocle.scala
@@ -1,13 +1,13 @@
 package argonaut
 
-import argonaut.Json._
-import argonaut.JsonObjectMonocle._
+import argonaut.Json.*
+import argonaut.JsonObjectMonocle.*
 import monocle.function.Each
 import monocle.function.Plated
 import monocle.Prism
 import monocle.Traversal
 import cats.Applicative
-import cats.syntax.all._
+import cats.syntax.all.*
 
 object JsonMonocle extends JsonMonocles
 

diff --git a/argonaut-monocle/shared/src/main/scala/argonaut/JsonObjectMonocle.scala b/argonaut-monocle/shared/src/main/scala/argonaut/JsonObjectMonocle.scala
@@ -1,14 +1,14 @@
 package argonaut
 
-import argonaut.Json._
+import argonaut.Json.*
 import monocle.function.At
 import monocle.function.Each
 import monocle.function.FilterIndex
 import monocle.function.Index
 import monocle.Lens
 import monocle.Traversal
 import cats.Applicative
-import cats.syntax.all._
+import cats.syntax.all.*
 
 object JsonObjectMonocle extends JsonObjectMonocles
 

diff --git a/argonaut-monocle/shared/src/main/scala/argonaut/JsonPath.scala b/argonaut-monocle/shared/src/main/scala/argonaut/JsonPath.scala
@@ -1,7 +1,7 @@
 package argonaut
 
-import argonaut.JsonMonocle._
-import argonaut.JsonObjectMonocle._
+import argonaut.JsonMonocle.*
+import argonaut.JsonObjectMonocle.*
 import monocle.function.At
 import monocle.function.FilterIndex
 import monocle.function.Index

diff --git a/argonaut-monocle/shared/src/test/scala/argonaut/JsonMonocleSpecification.scala b/argonaut-monocle/shared/src/test/scala/argonaut/JsonMonocleSpecification.scala
@@ -1,10 +1,10 @@
 package argonaut
 
-import argonaut.Data._
-import argonaut.JsonMonocle._
-import argonaut.JsonNumberCats._
-import argonaut.JsonObjectCats._
-import argonaut.JsonCats._
+import argonaut.Data.*
+import argonaut.JsonMonocle.*
+import argonaut.JsonNumberCats.*
+import argonaut.JsonObjectCats.*
+import argonaut.JsonCats.*
 import monocle.function.Plated
 import monocle.law.discipline.PrismTests
 import monocle.law.discipline.TraversalTests

diff --git a/argonaut-monocle/shared/src/test/scala/argonaut/JsonPathSpecification.scala b/argonaut-monocle/shared/src/test/scala/argonaut/JsonPathSpecification.scala
@@ -1,9 +1,9 @@
 package argonaut
 
-import argonaut.Argonaut._
+import argonaut.Argonaut.*
 import org.specs2.mutable.Specification
 import argonaut.JsonPath.root
-import argonaut.TestCompat._
+import argonaut.TestCompat.*
 
 class JsonPathSpecification extends Specification {
 

diff --git a/argonaut-monocle/shared/src/test/scala/argonaut/PrettyParamsMonocleSpecification.scala b/argonaut-monocle/shared/src/test/scala/argonaut/PrettyParamsMonocleSpecification.scala
@@ -1,9 +1,9 @@
 package argonaut
 
-import argonaut.Data._
-import argonaut.PrettyParamsCats._
+import argonaut.Data.*
+import argonaut.PrettyParamsCats.*
 import monocle.law.discipline.LensTests
-import org.scalacheck.Arbitrary._
+import org.scalacheck.Arbitrary.*
 
 object PrettyParamsMonocleSpecification extends ArgonautSpec {
   def is = s2"""

diff --git a/argonaut-scalaz/shared/src/main/scala/argonaut/ContextScalaz.scala b/argonaut-scalaz/shared/src/main/scala/argonaut/ContextScalaz.scala
@@ -1,14 +1,14 @@
 package argonaut
 
-import scalaz._
-import std.anyVal._
-import std.list._
-import std.string._
-import syntax.show._
-import syntax.equal._
-import syntax.std.list._
-import JsonScalaz._
-import ContextElementScalaz._
+import scalaz.*
+import std.anyVal.*
+import std.list.*
+import std.string.*
+import syntax.show.*
+import syntax.equal.*
+import syntax.std.list.*
+import JsonScalaz.*
+import ContextElementScalaz.*
 
 object ContextScalaz extends ContextScalazs