Merge pull request #4677 from satorg/scala3-style-imports

Scala3 style imports
typelevel · Feb 11, 2025 · d113317 · d113317
2 parents 5ac7e64 + 7c41928
commit d113317
Show file tree

Hide file tree

Showing 328 changed files with 879 additions and 880 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -29,5 +29,4 @@ project.excludeFilters = [
 rewrite.scala3.convertToNewSyntax = true
 runner.dialectOverride.allowSignificantIndentation = false
 runner.dialectOverride.allowAsForImportRename = false
-runner.dialectOverride.allowStarWildcardImport = false
 runner.dialectOverride.allowPostfixStarVarargSplices = false
diff --git a/algebra-core/src/main/scala/algebra/instances/bigDecimal.scala b/algebra-core/src/main/scala/algebra/instances/bigDecimal.scala
@@ -24,7 +24,7 @@ package instances
 
 import java.math.MathContext
 
-import algebra.ring._
+import algebra.ring.*
 
 package object bigDecimal extends BigDecimalInstances
 

diff --git a/algebra-core/src/main/scala/algebra/instances/bigInt.scala b/algebra-core/src/main/scala/algebra/instances/bigInt.scala
@@ -22,7 +22,7 @@
 package algebra
 package instances
 
-import algebra.ring._
+import algebra.ring.*
 
 package object bigInt extends BigIntInstances
 

diff --git a/algebra-core/src/main/scala/algebra/instances/bitSet.scala b/algebra-core/src/main/scala/algebra/instances/bitSet.scala
@@ -24,7 +24,7 @@ package instances
 
 import scala.collection.immutable.BitSet
 
-import algebra.lattice._
+import algebra.lattice.*
 
 package object bitSet extends BitSetInstances
 

diff --git a/algebra-core/src/main/scala/algebra/instances/byte.scala b/algebra-core/src/main/scala/algebra/instances/byte.scala
@@ -22,8 +22,8 @@
 package algebra
 package instances
 
-import algebra.lattice._
-import algebra.ring._
+import algebra.lattice.*
+import algebra.ring.*
 
 package object byte extends ByteInstances
 

diff --git a/algebra-core/src/main/scala/algebra/instances/int.scala b/algebra-core/src/main/scala/algebra/instances/int.scala
@@ -22,8 +22,8 @@
 package algebra
 package instances
 
-import algebra.lattice._
-import algebra.ring._
+import algebra.lattice.*
+import algebra.ring.*
 
 package object int extends IntInstances
 

diff --git a/algebra-core/src/main/scala/algebra/instances/long.scala b/algebra-core/src/main/scala/algebra/instances/long.scala
@@ -22,8 +22,8 @@
 package algebra
 package instances
 
-import algebra.lattice._
-import algebra.ring._
+import algebra.lattice.*
+import algebra.ring.*
 
 package object long extends LongInstances
 

diff --git a/algebra-core/src/main/scala/algebra/instances/map.scala b/algebra-core/src/main/scala/algebra/instances/map.scala
@@ -25,7 +25,7 @@ package instances
 import scala.annotation.nowarn
 import scala.collection.mutable
 
-import algebra.ring._
+import algebra.ring.*
 
 package object map extends MapInstances
 

diff --git a/algebra-core/src/main/scala/algebra/instances/short.scala b/algebra-core/src/main/scala/algebra/instances/short.scala
@@ -22,8 +22,8 @@
 package algebra
 package instances
 
-import algebra.lattice._
-import algebra.ring._
+import algebra.lattice.*
+import algebra.ring.*
 
 package object short extends ShortInstances
 

diff --git a/algebra-core/src/test/scala/algebra/ring/RingTest.scala b/algebra-core/src/test/scala/algebra/ring/RingTest.scala
@@ -21,9 +21,9 @@
 
 package algebra.ring
 
-import algebra.instances.bigInt._
+import algebra.instances.bigInt.*
 
-import org.scalacheck.Prop._
+import org.scalacheck.Prop.*
 
 class RingTest extends munit.DisciplineSuite {
   test("Ring.defaultFromBigInt") {

diff --git a/algebra-laws/shared/src/main/scala/algebra/laws/BaseLaws.scala b/algebra-laws/shared/src/main/scala/algebra/laws/BaseLaws.scala
@@ -21,7 +21,7 @@
 
 package algebra.laws
 
-import cats.kernel._
+import cats.kernel.*
 
 import org.typelevel.discipline.Laws
 

diff --git a/algebra-laws/shared/src/main/scala/algebra/laws/DeMorganLaws.scala b/algebra-laws/shared/src/main/scala/algebra/laws/DeMorganLaws.scala
@@ -21,10 +21,10 @@
 
 package algebra.laws
 
-import algebra._
-import algebra.lattice._
+import algebra.*
+import algebra.lattice.*
 import org.scalacheck.{Arbitrary, Prop}
-import org.scalacheck.Prop._
+import org.scalacheck.Prop.*
 import org.typelevel.discipline.Laws
 
 @deprecated("Laws moved to LogicLaws", since = "2.7.0")

diff --git a/algebra-laws/shared/src/main/scala/algebra/laws/GroupLaws.scala b/algebra-laws/shared/src/main/scala/algebra/laws/GroupLaws.scala
@@ -21,13 +21,13 @@
 
 package algebra.laws
 
-import cats.kernel._
-import cats.kernel.instances.option._
+import cats.kernel.*
+import cats.kernel.instances.option.*
 
 import org.typelevel.discipline.Laws
 
 import org.scalacheck.{Arbitrary, Prop}
-import org.scalacheck.Prop._
+import org.scalacheck.Prop.*
 
 @deprecated("Provided by cats.kernel.laws", since = "2.7.0")
 object GroupLaws {

diff --git a/algebra-laws/shared/src/main/scala/algebra/laws/LatticeLaws.scala b/algebra-laws/shared/src/main/scala/algebra/laws/LatticeLaws.scala
@@ -21,11 +21,11 @@
 
 package algebra.laws
 
-import algebra._
-import algebra.lattice._
+import algebra.*
+import algebra.lattice.*
 
 import org.scalacheck.{Arbitrary, Prop}
-import org.scalacheck.Prop._
+import org.scalacheck.Prop.*
 import scala.annotation.nowarn
 
 object LatticeLaws {

diff --git a/algebra-laws/shared/src/main/scala/algebra/laws/LatticePartialOrderLaws.scala b/algebra-laws/shared/src/main/scala/algebra/laws/LatticePartialOrderLaws.scala
@@ -21,15 +21,15 @@
 
 package algebra.laws
 
-import algebra._
-import algebra.lattice._
+import algebra.*
+import algebra.lattice.*
 
 import org.typelevel.discipline.Laws
 
 import org.scalacheck.{Arbitrary, Prop}
-import org.scalacheck.Prop._
+import org.scalacheck.Prop.*
 
-import algebra.instances.boolean._
+import algebra.instances.boolean.*
 
 object LatticePartialOrderLaws {
   def apply[A: Eq: Arbitrary] = new LatticePartialOrderLaws[A] {

diff --git a/algebra-laws/shared/src/main/scala/algebra/laws/LogicLaws.scala b/algebra-laws/shared/src/main/scala/algebra/laws/LogicLaws.scala
@@ -21,11 +21,11 @@
 
 package algebra.laws
 
-import algebra._
+import algebra.*
 import algebra.lattice.{Bool, GenBool, Heyting}
 
 import org.scalacheck.{Arbitrary, Prop}
-import org.scalacheck.Prop._
+import org.scalacheck.Prop.*
 import scala.annotation.nowarn
 
 object LogicLaws {

diff --git a/algebra-laws/shared/src/main/scala/algebra/laws/OrderLaws.scala b/algebra-laws/shared/src/main/scala/algebra/laws/OrderLaws.scala
@@ -21,14 +21,14 @@
 
 package algebra.laws
 
-import cats.kernel._
+import cats.kernel.*
 
 import org.typelevel.discipline.Laws
 
 import org.scalacheck.{Arbitrary, Cogen, Prop}
-import org.scalacheck.Prop._
+import org.scalacheck.Prop.*
 
-import cats.kernel.instances.all._
+import cats.kernel.instances.all.*
 import algebra.ring.Signed
 import algebra.ring.CommutativeRing
 import algebra.ring.TruncatedDivision

diff --git a/algebra-laws/shared/src/main/scala/algebra/laws/RingLaws.scala b/algebra-laws/shared/src/main/scala/algebra/laws/RingLaws.scala
@@ -22,15 +22,15 @@
 package algebra
 package laws
 
-import algebra.ring._
+import algebra.ring.*
 
 import algebra.laws.platform.Platform
 
 import org.typelevel.discipline.Predicate
 
 import org.scalacheck.{Arbitrary, Prop}
-import org.scalacheck.Arbitrary._
-import org.scalacheck.Prop._
+import org.scalacheck.Arbitrary.*
+import org.scalacheck.Prop.*
 import scala.annotation.nowarn
 
 object RingLaws {

diff --git a/algebra-laws/shared/src/main/scala/algebra/laws/Rules.scala b/algebra-laws/shared/src/main/scala/algebra/laws/Rules.scala
@@ -21,10 +21,10 @@
 
 package algebra.laws
 
-import cats.kernel._
-import org.scalacheck.Prop._
+import cats.kernel.*
+import org.scalacheck.Prop.*
 import org.scalacheck.{Arbitrary, Prop}
-import cats.kernel.instances.boolean._
+import cats.kernel.instances.boolean.*
 import cats.kernel.laws.discipline.SerializableTests
 
 object Rules {

diff --git a/algebra-laws/shared/src/main/scala/algebra/laws/package.scala b/algebra-laws/shared/src/main/scala/algebra/laws/package.scala
@@ -21,7 +21,7 @@
 
 package algebra
 
-import org.scalacheck._
+import org.scalacheck.*
 import org.scalacheck.util.Pretty
 import Prop.{False, Proof, Result}
 

diff --git a/algebra-laws/shared/src/test/scala/algebra/laws/FPApprox.scala b/algebra-laws/shared/src/test/scala/algebra/laws/FPApprox.scala
@@ -26,8 +26,8 @@ import java.math.MathContext
 
 import org.scalacheck.Arbitrary
 
-import algebra._
-import algebra.ring._
+import algebra.*
+import algebra.ring.*
 
 /**
  * A wrapper type for approximate floating point values like Float, Double, and

diff --git a/algebra-laws/shared/src/test/scala/algebra/laws/LawTests.scala b/algebra-laws/shared/src/test/scala/algebra/laws/LawTests.scala
@@ -22,9 +22,9 @@
 package algebra
 package laws
 
-import algebra.lattice._
-import algebra.ring._
-import algebra.instances.all._
+import algebra.lattice.*
+import algebra.ring.*
+import algebra.instances.all.*
 import algebra.instances.BigDecimalAlgebra
 
 import algebra.laws.platform.Platform

diff --git a/algebra-laws/shared/src/test/scala/algebra/laws/Rat.scala b/algebra-laws/shared/src/test/scala/algebra/laws/Rat.scala
@@ -23,7 +23,7 @@ package algebra
 package laws
 
 import algebra.lattice.DistributiveLattice
-import algebra.ring._
+import algebra.ring.*
 import org.scalacheck.{Arbitrary, Gen}
 import org.scalacheck.Arbitrary.arbitrary
 

diff --git a/alleycats-core/src/main/scala/alleycats/Empty.scala b/alleycats-core/src/main/scala/alleycats/Empty.scala
@@ -22,7 +22,7 @@
 package alleycats
 
 import cats.{Eq, Monoid}
-import cats.syntax.eq._
+import cats.syntax.eq.*
 
 trait Empty[A] extends Serializable {
   def empty: A

diff --git a/alleycats-core/src/main/scala/alleycats/One.scala b/alleycats-core/src/main/scala/alleycats/One.scala
@@ -22,7 +22,7 @@
 package alleycats
 
 import cats.Eq
-import cats.syntax.eq._
+import cats.syntax.eq.*
 
 trait One[A] extends Serializable {
   def one: A

diff --git a/alleycats-core/src/main/scala/alleycats/Zero.scala b/alleycats-core/src/main/scala/alleycats/Zero.scala
@@ -22,7 +22,7 @@
 package alleycats
 
 import cats.Eq
-import cats.syntax.eq._
+import cats.syntax.eq.*
 
 trait Zero[A] extends Serializable {
   def zero: A

diff --git a/alleycats-core/src/main/scala/alleycats/std/map.scala b/alleycats-core/src/main/scala/alleycats/std/map.scala
@@ -22,7 +22,7 @@
 package alleycats
 package std
 
-import cats._
+import cats.*
 import cats.data.Chain
 import cats.kernel.instances.StaticMethods.wrapMutableIndexedSeq
 

diff --git a/alleycats-core/src/main/scala/alleycats/std/set.scala b/alleycats-core/src/main/scala/alleycats/std/set.scala
@@ -22,7 +22,7 @@
 package alleycats
 package std
 
-import alleycats.compat.scalaVersionSpecific._
+import alleycats.compat.scalaVersionSpecific.*
 import cats.{Alternative, Always, Applicative, Eval, Foldable, Monad, Monoid, Traverse, TraverseFilter}
 
 import scala.annotation.tailrec
@@ -31,7 +31,7 @@ object set extends SetInstances
 
 @suppressUnusedImportWarningForScalaVersionSpecific
 trait SetInstances {
-  import SetInstances._
+  import SetInstances.*
 
   // We use a def instead of val here as a workaround to the MiMa
   // 'ReversedMissingMethodProblem' error.

diff --git a/alleycats-core/src/main/scala/alleycats/syntax/foldable.scala b/alleycats-core/src/main/scala/alleycats/syntax/foldable.scala
@@ -23,7 +23,7 @@ package alleycats
 package syntax
 
 import cats.Foldable
-import cats.syntax.foldable._
+import cats.syntax.foldable.*
 
 object foldable extends FoldableSyntax
 

diff --git a/alleycats-laws/shared/src/main/scala/alleycats/laws/discipline/FlatMapRecTests.scala b/alleycats-laws/shared/src/main/scala/alleycats/laws/discipline/FlatMapRecTests.scala
@@ -21,11 +21,11 @@
 
 package alleycats.laws.discipline
 
-import cats._
+import cats.*
 import cats.laws.FlatMapLaws
-import cats.laws.discipline._
+import cats.laws.discipline.*
 import org.scalacheck.Arbitrary
-import org.scalacheck.Prop._
+import org.scalacheck.Prop.*
 import org.typelevel.discipline.Laws
 
 trait FlatMapRecTests[F[_]] extends Laws {

diff --git a/alleycats-laws/shared/src/main/scala/alleycats/laws/discipline/ReferentialEqTests.scala b/alleycats-laws/shared/src/main/scala/alleycats/laws/discipline/ReferentialEqTests.scala
@@ -23,7 +23,7 @@ package alleycats.laws.discipline
 
 import cats.kernel.Eq
 import cats.kernel.laws.EqLaws
-import cats.kernel.laws.discipline._
+import cats.kernel.laws.discipline.*
 import org.scalacheck.Arbitrary
 import org.scalacheck.Prop.forAll
 import org.typelevel.discipline.Laws

diff --git a/alleycats-laws/shared/src/main/scala/alleycats/laws/discipline/SystemIdentityHashTests.scala b/alleycats-laws/shared/src/main/scala/alleycats/laws/discipline/SystemIdentityHashTests.scala
@@ -23,7 +23,7 @@ package alleycats.laws.discipline
 
 import cats.kernel.{Eq, Hash}
 import cats.kernel.laws.HashLaws
-import cats.kernel.laws.discipline._
+import cats.kernel.laws.discipline.*
 import org.scalacheck.Arbitrary
 import org.scalacheck.Prop.forAll
 

diff --git a/alleycats-laws/shared/src/test/scala/alleycats/tests/AlleycatsSuite.scala b/alleycats-laws/shared/src/test/scala/alleycats/tests/AlleycatsSuite.scala
@@ -22,8 +22,8 @@
 package alleycats.tests
 
 import alleycats.std.MapInstances
-import cats._
-import cats.instances.all._
+import cats.*
+import cats.instances.all.*
 import org.scalacheck.{Arbitrary, Gen}
 import org.scalacheck.Test.Parameters
 

diff --git a/alleycats-laws/shared/src/test/scala/alleycats/tests/IterableTests.scala b/alleycats-laws/shared/src/test/scala/alleycats/tests/IterableTests.scala
@@ -21,9 +21,9 @@
 
 package alleycats.tests
 
-import alleycats.std.all._
+import alleycats.std.all.*
 import cats.{Eval, Foldable}
-import cats.instances.all._
+import cats.instances.all.*
 import cats.laws.discipline.{TraverseFilterTests, TraverseTests}
 
 class IterableTests extends AlleycatsSuite {