diff --git a/bench/src/main/scala/cats/bench/FoldBench.scala b/bench/src/main/scala/cats/bench/FoldBench.scala index 8f1d43bdc8..91cbfefd89 100644 --- a/bench/src/main/scala/cats/bench/FoldBench.scala +++ b/bench/src/main/scala/cats/bench/FoldBench.scala @@ -1,8 +1,8 @@ package cats.bench import cats.data.Const -import cats.std.string._ -import cats.std.list._ +import cats.instances.string._ +import cats.instances.list._ import cats.{Foldable, Traverse} import org.openjdk.jmh.annotations.{Benchmark, Scope, State} diff --git a/core/src/main/scala/cats/Applicative.scala b/core/src/main/scala/cats/Applicative.scala index 49355724c8..108df0cf33 100644 --- a/core/src/main/scala/cats/Applicative.scala +++ b/core/src/main/scala/cats/Applicative.scala @@ -1,6 +1,6 @@ package cats -import cats.std.list._ +import cats.instances.list._ import simulacrum.typeclass /** diff --git a/core/src/main/scala/cats/Foldable.scala b/core/src/main/scala/cats/Foldable.scala index e89c2a468e..fa0a9df71a 100644 --- a/core/src/main/scala/cats/Foldable.scala +++ b/core/src/main/scala/cats/Foldable.scala @@ -1,7 +1,7 @@ package cats import scala.collection.mutable -import cats.std.long._ +import cats.instances.long._ import simulacrum.typeclass /** diff --git a/core/src/main/scala/cats/data/OneAnd.scala b/core/src/main/scala/cats/data/OneAnd.scala index 3048e4aacd..4eb978ee1e 100644 --- a/core/src/main/scala/cats/data/OneAnd.scala +++ b/core/src/main/scala/cats/data/OneAnd.scala @@ -3,7 +3,7 @@ package data import scala.annotation.tailrec import scala.collection.mutable.ListBuffer -import cats.std.list._ +import cats.instances.list._ /** * A data type which represents a single element (head) and some other diff --git a/core/src/main/scala/cats/data/OptionT.scala b/core/src/main/scala/cats/data/OptionT.scala index 474337bc0e..7668960af7 100644 --- a/core/src/main/scala/cats/data/OptionT.scala +++ b/core/src/main/scala/cats/data/OptionT.scala @@ -1,7 +1,7 @@ package cats package data -import std.option.{catsStdInstancesForOption => optionInstance} +import instances.option.{catsStdInstancesForOption => optionInstance} /** * `OptionT[F[_], A]` is a light wrapper on an `F[Option[A]]` with some diff --git a/core/src/main/scala/cats/data/WriterT.scala b/core/src/main/scala/cats/data/WriterT.scala index 37e7adddda..e1edf6e620 100644 --- a/core/src/main/scala/cats/data/WriterT.scala +++ b/core/src/main/scala/cats/data/WriterT.scala @@ -1,7 +1,7 @@ package cats package data -import cats.kernel.std.tuple._ +import cats.kernel.instances.tuple._ import cats.functor.{Bifunctor, Contravariant} final case class WriterT[F[_], L, V](run: F[(L, V)]) { diff --git a/core/src/main/scala/cats/implicits/package.scala b/core/src/main/scala/cats/implicits/package.scala index d2e533075e..fc5604da63 100644 --- a/core/src/main/scala/cats/implicits/package.scala +++ b/core/src/main/scala/cats/implicits/package.scala @@ -1,3 +1,3 @@ package cats -object implicits extends syntax.AllSyntax with std.AllInstances +object implicits extends syntax.AllSyntax with instances.AllInstances diff --git a/core/src/main/scala/cats/std/all.scala b/core/src/main/scala/cats/instances/all.scala similarity index 95% rename from core/src/main/scala/cats/std/all.scala rename to core/src/main/scala/cats/instances/all.scala index 27c80e9d90..56f55e98b5 100644 --- a/core/src/main/scala/cats/std/all.scala +++ b/core/src/main/scala/cats/instances/all.scala @@ -1,5 +1,5 @@ package cats -package std +package instances trait AllInstances extends FunctionInstances diff --git a/core/src/main/scala/cats/std/anyval.scala b/core/src/main/scala/cats/instances/anyval.scala similarity index 61% rename from core/src/main/scala/cats/std/anyval.scala rename to core/src/main/scala/cats/instances/anyval.scala index 98a09b7f87..05060c3da9 100644 --- a/core/src/main/scala/cats/std/anyval.scala +++ b/core/src/main/scala/cats/instances/anyval.scala @@ -1,5 +1,5 @@ package cats -package std +package instances trait AnyValInstances extends IntInstances @@ -13,38 +13,38 @@ trait AnyValInstances with UnitInstances with TupleInstances -trait IntInstances extends cats.kernel.std.IntInstances { +trait IntInstances extends cats.kernel.instances.IntInstances { implicit val catsStdShowForInt: Show[Int] = Show.fromToString[Int] } -trait ByteInstances extends cats.kernel.std.ByteInstances { +trait ByteInstances extends cats.kernel.instances.ByteInstances { implicit val catsStdShowForByte: Show[Byte] = Show.fromToString[Byte] } -trait CharInstances extends cats.kernel.std.CharInstances { +trait CharInstances extends cats.kernel.instances.CharInstances { implicit val catsStdShowForChar: Show[Char] = Show.fromToString[Char] } -trait ShortInstances extends cats.kernel.std.ShortInstances { +trait ShortInstances extends cats.kernel.instances.ShortInstances { implicit val catsStdShowForShort: Show[Short] = Show.fromToString[Short] } -trait LongInstances extends cats.kernel.std.LongInstances { +trait LongInstances extends cats.kernel.instances.LongInstances { implicit val catsStdShowForLong: Show[Long] = Show.fromToString[Long] } -trait FloatInstances extends cats.kernel.std.FloatInstances { +trait FloatInstances extends cats.kernel.instances.FloatInstances { implicit val catsStdShowForFloat: Show[Float] = Show.fromToString[Float] } -trait DoubleInstances extends cats.kernel.std.DoubleInstances { +trait DoubleInstances extends cats.kernel.instances.DoubleInstances { implicit val catsStdShowForDouble: Show[Double] = Show.fromToString[Double] } -trait BooleanInstances extends cats.kernel.std.BooleanInstances { +trait BooleanInstances extends cats.kernel.instances.BooleanInstances { implicit val catsStdShowForBoolean: Show[Boolean] = Show.fromToString[Boolean] } -trait UnitInstances extends cats.kernel.std.UnitInstances { +trait UnitInstances extends cats.kernel.instances.UnitInstances { implicit val catsStdShowForUnit: Show[Unit] = Show.fromToString[Unit] } diff --git a/core/src/main/scala/cats/std/bigDecimal.scala b/core/src/main/scala/cats/instances/bigDecimal.scala similarity index 88% rename from core/src/main/scala/cats/std/bigDecimal.scala rename to core/src/main/scala/cats/instances/bigDecimal.scala index 572bcf24ee..9acba3fc35 100644 --- a/core/src/main/scala/cats/std/bigDecimal.scala +++ b/core/src/main/scala/cats/instances/bigDecimal.scala @@ -1,5 +1,5 @@ package cats -package std +package instances trait BigDecimalInstances { implicit val catsStdShowForBigDecimal: Show[BigDecimal] = diff --git a/core/src/main/scala/cats/std/bigInt.scala b/core/src/main/scala/cats/instances/bigInt.scala similarity index 52% rename from core/src/main/scala/cats/std/bigInt.scala rename to core/src/main/scala/cats/instances/bigInt.scala index 03d680eec9..8aab1e01cc 100644 --- a/core/src/main/scala/cats/std/bigInt.scala +++ b/core/src/main/scala/cats/instances/bigInt.scala @@ -1,7 +1,7 @@ package cats -package std +package instances -trait BigIntInstances extends cats.kernel.std.BigIntInstances { +trait BigIntInstances extends cats.kernel.instances.BigIntInstances { implicit val catsStdShowForBigInt: Show[BigInt] = Show.fromToString[BigInt] } diff --git a/core/src/main/scala/cats/std/either.scala b/core/src/main/scala/cats/instances/either.scala similarity index 96% rename from core/src/main/scala/cats/std/either.scala rename to core/src/main/scala/cats/instances/either.scala index 019a4dc29f..8bdb39dd64 100644 --- a/core/src/main/scala/cats/std/either.scala +++ b/core/src/main/scala/cats/instances/either.scala @@ -1,5 +1,5 @@ package cats -package std +package instances import scala.annotation.tailrec import cats.data.Xor @@ -82,7 +82,7 @@ trait EitherInstances extends EitherInstances1 { } } -private[std] sealed trait EitherInstances1 extends EitherInstances2 { +private[instances] sealed trait EitherInstances1 extends EitherInstances2 { implicit def catsStdPartialOrderForEither[A, B](implicit A: PartialOrder[A], B: PartialOrder[B]): PartialOrder[Either[A, B]] = new PartialOrder[Either[A, B]] { def partialCompare(x: Either[A, B], y: Either[A, B]): Double = x.fold( @@ -92,7 +92,7 @@ private[std] sealed trait EitherInstances1 extends EitherInstances2 { } } -private[std] sealed trait EitherInstances2 { +private[instances] sealed trait EitherInstances2 { implicit def catsStdEqForEither[A, B](implicit A: Eq[A], B: Eq[B]): Eq[Either[A, B]] = new Eq[Either[A, B]] { def eqv(x: Either[A, B], y: Either[A, B]): Boolean = x.fold( a => y.fold(A.eqv(a, _), _ => false), diff --git a/core/src/main/scala/cats/std/function.scala b/core/src/main/scala/cats/instances/function.scala similarity index 82% rename from core/src/main/scala/cats/std/function.scala rename to core/src/main/scala/cats/instances/function.scala index 486e12ad1e..9023a7994c 100644 --- a/core/src/main/scala/cats/std/function.scala +++ b/core/src/main/scala/cats/instances/function.scala @@ -1,11 +1,11 @@ package cats -package std +package instances import cats.arrow.{Arrow, Choice} import cats.data.Xor import cats.functor.Contravariant -private[std] sealed trait Function0Instances { +private[instances] sealed trait Function0Instances { implicit val catsStdBimonadForFunction0: Bimonad[Function0] = new Bimonad[Function0] { @@ -26,7 +26,7 @@ private[std] sealed trait Function0Instances { } } -private[std] sealed trait Function1Instances extends Function1Instances0 { +private[instances] sealed trait Function1Instances extends Function1Instances0 { implicit def catsStdContravariantForFunction1[R]: Contravariant[? => R] = new Contravariant[? => R] { def contramap[T1, T0](fa: T1 => R)(f: T0 => T1): T0 => R = @@ -78,7 +78,7 @@ private[std] sealed trait Function1Instances extends Function1Instances0 { new Function1MonoidK {} } -private[std] sealed trait Function1Instances0 { +private[instances] sealed trait Function1Instances0 { implicit def catsStdSemigroupForFunction1[A,B](implicit S: Semigroup[B]): Semigroup[A => B] = new Function1Semigroup[A, B] { def B: Semigroup[B] = S } @@ -86,7 +86,7 @@ private[std] sealed trait Function1Instances0 { new Function1SemigroupK {} } -private[std] sealed trait Function1Semigroup[A, B] extends Semigroup[A => B] { +private[instances] sealed trait Function1Semigroup[A, B] extends Semigroup[A => B] { implicit def B: Semigroup[B] override def combine(x: A => B, y: A => B): A => B = { a => @@ -94,17 +94,17 @@ private[std] sealed trait Function1Semigroup[A, B] extends Semigroup[A => B] { } } -private[std] sealed trait Function1Monoid[A, B] extends Monoid[A => B] with Function1Semigroup[A, B] { +private[instances] sealed trait Function1Monoid[A, B] extends Monoid[A => B] with Function1Semigroup[A, B] { implicit def B: Monoid[B] override def empty: A => B = _ => B.empty } -private[std] sealed trait Function1SemigroupK extends SemigroupK[λ[α => α => α]] { +private[instances] sealed trait Function1SemigroupK extends SemigroupK[λ[α => α => α]] { override def combineK[A](x: A => A, y: A => A): A => A = x compose y } -private[std] sealed trait Function1MonoidK extends MonoidK[λ[α => α => α]] with Function1SemigroupK { +private[instances] sealed trait Function1MonoidK extends MonoidK[λ[α => α => α]] with Function1SemigroupK { override def empty[A]: A => A = identity[A] } diff --git a/core/src/main/scala/cats/std/future.scala b/core/src/main/scala/cats/instances/future.scala similarity index 94% rename from core/src/main/scala/cats/std/future.scala rename to core/src/main/scala/cats/instances/future.scala index 8cb9b23483..cd7bd196f4 100644 --- a/core/src/main/scala/cats/std/future.scala +++ b/core/src/main/scala/cats/instances/future.scala @@ -1,5 +1,5 @@ package cats -package std +package instances import cats.data.Xor @@ -35,12 +35,12 @@ trait FutureInstances extends FutureInstances1 { } } -private[std] sealed trait FutureInstances1 extends FutureInstances2 { +private[instances] sealed trait FutureInstances1 extends FutureInstances2 { implicit def catsStdMonoidForFuture[A: Monoid](implicit ec: ExecutionContext): Monoid[Future[A]] = new FutureMonoid[A] } -private[std] sealed trait FutureInstances2 { +private[instances] sealed trait FutureInstances2 { implicit def catsStdSemigroupForFuture[A: Semigroup](implicit ec: ExecutionContext): Semigroup[Future[A]] = new FutureSemigroup[A] } diff --git a/core/src/main/scala/cats/std/list.scala b/core/src/main/scala/cats/instances/list.scala similarity index 96% rename from core/src/main/scala/cats/std/list.scala rename to core/src/main/scala/cats/instances/list.scala index 6154c7d494..437c677653 100644 --- a/core/src/main/scala/cats/std/list.scala +++ b/core/src/main/scala/cats/instances/list.scala @@ -1,5 +1,5 @@ package cats -package std +package instances import cats.syntax.show._ @@ -8,7 +8,7 @@ import scala.collection.mutable.ListBuffer import cats.data.Xor -trait ListInstances extends cats.kernel.std.ListInstances { +trait ListInstances extends cats.kernel.instances.ListInstances { implicit val catsStdInstancesForList: Traverse[List] with MonadCombine[List] with MonadRec[List] with CoflatMap[List] = new Traverse[List] with MonadCombine[List] with MonadRec[List] with CoflatMap[List] { diff --git a/core/src/main/scala/cats/std/map.scala b/core/src/main/scala/cats/instances/map.scala similarity index 96% rename from core/src/main/scala/cats/std/map.scala rename to core/src/main/scala/cats/instances/map.scala index 9e9a1fd965..ca525be5f8 100644 --- a/core/src/main/scala/cats/std/map.scala +++ b/core/src/main/scala/cats/instances/map.scala @@ -1,7 +1,7 @@ package cats -package std +package instances -trait MapInstances extends cats.kernel.std.MapInstances { +trait MapInstances extends cats.kernel.instances.MapInstances { implicit def catsStdShowForMap[A, B](implicit showA: Show[A], showB: Show[B]): Show[Map[A, B]] = Show.show[Map[A, B]] { m => diff --git a/core/src/main/scala/cats/std/option.scala b/core/src/main/scala/cats/instances/option.scala similarity index 96% rename from core/src/main/scala/cats/std/option.scala rename to core/src/main/scala/cats/instances/option.scala index 41204c5326..c3ba6b635a 100644 --- a/core/src/main/scala/cats/std/option.scala +++ b/core/src/main/scala/cats/instances/option.scala @@ -1,10 +1,10 @@ package cats -package std +package instances import scala.annotation.tailrec import cats.data.Xor -trait OptionInstances extends cats.kernel.std.OptionInstances { +trait OptionInstances extends cats.kernel.instances.OptionInstances { implicit val catsStdInstancesForOption: Traverse[Option] with MonadError[Option, Unit] with MonadCombine[Option] with MonadRec[Option] with CoflatMap[Option] with Alternative[Option] = new Traverse[Option] with MonadError[Option, Unit] with MonadCombine[Option] with MonadRec[Option] with CoflatMap[Option] with Alternative[Option] { diff --git a/core/src/main/scala/cats/std/package.scala b/core/src/main/scala/cats/instances/package.scala similarity index 97% rename from core/src/main/scala/cats/std/package.scala rename to core/src/main/scala/cats/instances/package.scala index 2bc6a91fca..62e2138956 100644 --- a/core/src/main/scala/cats/std/package.scala +++ b/core/src/main/scala/cats/instances/package.scala @@ -1,6 +1,6 @@ package cats -package object std { +package object instances { object all extends AllInstances object either extends EitherInstances diff --git a/core/src/main/scala/cats/std/set.scala b/core/src/main/scala/cats/instances/set.scala similarity index 92% rename from core/src/main/scala/cats/std/set.scala rename to core/src/main/scala/cats/instances/set.scala index 0c95763dec..0629b5bbb1 100644 --- a/core/src/main/scala/cats/std/set.scala +++ b/core/src/main/scala/cats/instances/set.scala @@ -1,9 +1,9 @@ package cats -package std +package instances import cats.syntax.show._ -trait SetInstances extends cats.kernel.std.SetInstances { +trait SetInstances extends cats.kernel.instances.SetInstances { implicit val catsStdInstancesForSet: Foldable[Set] with MonoidK[Set] = new Foldable[Set] with MonoidK[Set] { diff --git a/core/src/main/scala/cats/std/stream.scala b/core/src/main/scala/cats/instances/stream.scala similarity index 96% rename from core/src/main/scala/cats/std/stream.scala rename to core/src/main/scala/cats/instances/stream.scala index b2b5595dae..6247ecf10d 100644 --- a/core/src/main/scala/cats/std/stream.scala +++ b/core/src/main/scala/cats/instances/stream.scala @@ -1,9 +1,9 @@ package cats -package std +package instances import cats.syntax.show._ -trait StreamInstances extends cats.kernel.std.StreamInstances { +trait StreamInstances extends cats.kernel.instances.StreamInstances { implicit val catsStdInstancesForStream: Traverse[Stream] with MonadCombine[Stream] with CoflatMap[Stream] = new Traverse[Stream] with MonadCombine[Stream] with CoflatMap[Stream] { diff --git a/core/src/main/scala/cats/std/string.scala b/core/src/main/scala/cats/instances/string.scala similarity index 52% rename from core/src/main/scala/cats/std/string.scala rename to core/src/main/scala/cats/instances/string.scala index 7f46057ea2..a4c278464b 100644 --- a/core/src/main/scala/cats/std/string.scala +++ b/core/src/main/scala/cats/instances/string.scala @@ -1,7 +1,7 @@ package cats -package std +package instances -trait StringInstances extends cats.kernel.std.StringInstances { +trait StringInstances extends cats.kernel.instances.StringInstances { implicit val catsStdShowForString: Show[String] = Show.fromToString[String] } diff --git a/core/src/main/scala/cats/std/try.scala b/core/src/main/scala/cats/instances/try.scala similarity index 96% rename from core/src/main/scala/cats/std/try.scala rename to core/src/main/scala/cats/instances/try.scala index 3cdfc607cb..32ee335f35 100644 --- a/core/src/main/scala/cats/std/try.scala +++ b/core/src/main/scala/cats/instances/try.scala @@ -1,5 +1,5 @@ package cats -package std +package instances import cats.data.Xor import TryInstances.castFailure @@ -106,7 +106,7 @@ trait TryInstances extends TryInstances1 { } } -private[std] object TryInstances { +private[instances] object TryInstances { /** * A `Failure` can be statically typed as `Try[A]` for all `A`, because it * does not actually contain an `A` value (as `Success[A]` does). @@ -114,12 +114,12 @@ private[std] object TryInstances { @inline final def castFailure[A](f: Failure[_]): Try[A] = f.asInstanceOf[Try[A]] } -private[std] sealed trait TryInstances1 extends TryInstances2 { +private[instances] sealed trait TryInstances1 extends TryInstances2 { implicit def catsStdMonoidForTry[A: Monoid]: Monoid[Try[A]] = new TryMonoid[A] } -private[std] sealed trait TryInstances2 { +private[instances] sealed trait TryInstances2 { implicit def catsStdSemigroupForTry[A: Semigroup]: Semigroup[Try[A]] = new TrySemigroup[A] } diff --git a/core/src/main/scala/cats/std/tuple.scala b/core/src/main/scala/cats/instances/tuple.scala similarity index 88% rename from core/src/main/scala/cats/std/tuple.scala rename to core/src/main/scala/cats/instances/tuple.scala index 76b9050e06..13a1b32edb 100644 --- a/core/src/main/scala/cats/std/tuple.scala +++ b/core/src/main/scala/cats/instances/tuple.scala @@ -1,7 +1,7 @@ package cats -package std +package instances -trait TupleInstances extends Tuple2Instances with cats.kernel.std.TupleInstances +trait TupleInstances extends Tuple2Instances with cats.kernel.instances.TupleInstances sealed trait Tuple2Instances { implicit val catsStdBitraverseForTuple2: Bitraverse[Tuple2] = diff --git a/core/src/main/scala/cats/std/vector.scala b/core/src/main/scala/cats/instances/vector.scala similarity index 96% rename from core/src/main/scala/cats/std/vector.scala rename to core/src/main/scala/cats/instances/vector.scala index 07fb55430f..caec99171a 100644 --- a/core/src/main/scala/cats/std/vector.scala +++ b/core/src/main/scala/cats/instances/vector.scala @@ -1,5 +1,5 @@ package cats -package std +package instances import cats.syntax.show._ @@ -7,7 +7,7 @@ import scala.annotation.tailrec import scala.collection.+: import scala.collection.immutable.VectorBuilder -trait VectorInstances extends cats.kernel.std.VectorInstances { +trait VectorInstances extends cats.kernel.instances.VectorInstances { implicit val catsStdInstancesForVector: Traverse[Vector] with MonadCombine[Vector] with CoflatMap[Vector] = new Traverse[Vector] with MonadCombine[Vector] with CoflatMap[Vector] { diff --git a/docs/src/main/tut/faq.md b/docs/src/main/tut/faq.md index c8722df3a0..8e343b9605 100644 --- a/docs/src/main/tut/faq.md +++ b/docs/src/main/tut/faq.md @@ -43,7 +43,7 @@ val o: Option[String] = None o.orEmpty ``` -**Note**: if you import `cats.implicits._` (the preferred method), you should _not_ also use imports like `cats.syntax.option._` or `cats.std.either._`. This can result in ambiguous implicit values that cause bewildering compile errors. +**Note**: if you import `cats.implicits._` (the preferred method), you should _not_ also use imports like `cats.syntax.option._` or `cats.instances.either._`. This can result in ambiguous implicit values that cause bewildering compile errors. ## Why can't the compiler find implicit instances for Future? diff --git a/docs/src/main/tut/invariant.md b/docs/src/main/tut/invariant.md index 849c84a3ec..f0ce5c9529 100644 --- a/docs/src/main/tut/invariant.md +++ b/docs/src/main/tut/invariant.md @@ -86,12 +86,6 @@ import java.util.Date import cats._ import cats.implicits._ -// or only import what's actually required: -// import cats.Semigroup -// import cats.std.long._ -// import cats.syntax.semigroup._ -// import cats.syntax.invariant._ - def longToDate: Long => Date = new Date(_) def dateToLong: Date => Long = _.getTime diff --git a/free/src/test/scala/cats/free/FreeTests.scala b/free/src/test/scala/cats/free/FreeTests.scala index ef9b3e0a5d..3d744b16de 100644 --- a/free/src/test/scala/cats/free/FreeTests.scala +++ b/free/src/test/scala/cats/free/FreeTests.scala @@ -108,7 +108,7 @@ class FreeTests extends CatsSuite { } object FreeTests extends FreeTestsInstances { - import cats.std.function._ + import cats.instances.function._ implicit def trampolineArbitrary[A:Arbitrary]: Arbitrary[Trampoline[A]] = freeArbitrary[Function0, A] diff --git a/js/src/main/scala/cats/js/std/future.scala b/js/src/main/scala/cats/js/std/future.scala index fb43193ac2..d00daf10fd 100644 --- a/js/src/main/scala/cats/js/std/future.scala +++ b/js/src/main/scala/cats/js/std/future.scala @@ -1,12 +1,12 @@ package cats package js -package std +package instances import scala.concurrent.Future import scala.concurrent.{ExecutionContext => E} import scala.concurrent.duration.FiniteDuration -import cats.std.FutureCoflatMap +import cats.instances.FutureCoflatMap import cats.syntax.all._ object future extends FutureInstances0 @@ -18,7 +18,7 @@ object Await { } } -private[std] sealed trait FutureInstances0 extends FutureInstances1 { +private[instances] sealed trait FutureInstances0 extends FutureInstances1 { def futureComonad(atMost: FiniteDuration)(implicit ec: E): Comonad[Future] = new FutureCoflatMap with Comonad[Future] { def extract[A](x: Future[A]): A = @@ -32,7 +32,7 @@ private[std] sealed trait FutureInstances0 extends FutureInstances1 { } } -private[std] sealed trait FutureInstances1 extends FutureInstances2 { +private[instances] sealed trait FutureInstances1 extends FutureInstances2 { def futurePartialOrder[A: PartialOrder](atMost: FiniteDuration)(implicit ec: E): PartialOrder[Future[A]] = new PartialOrder[Future[A]] { def partialCompare(x: Future[A], y: Future[A]): Double = @@ -41,7 +41,7 @@ private[std] sealed trait FutureInstances1 extends FutureInstances2 { } -private[std] sealed trait FutureInstances2 { +private[instances] sealed trait FutureInstances2 { def futureEq[A: Eq](atMost: FiniteDuration)(implicit ec: E): Eq[Future[A]] = new Eq[Future[A]] { def eqv(x: Future[A], y: Future[A]): Boolean = diff --git a/js/src/test/scala/cats/tests/FutureTests.scala b/js/src/test/scala/cats/tests/FutureTests.scala index b0dc5172dc..f007a0c353 100644 --- a/js/src/test/scala/cats/tests/FutureTests.scala +++ b/js/src/test/scala/cats/tests/FutureTests.scala @@ -4,8 +4,8 @@ package tests import cats.data.Xor import cats.laws.discipline._ -import cats.js.std.Await -import cats.js.std.future.futureComonad +import cats.js.instances.Await +import cats.js.instances.future.futureComonad import cats.tests.CatsSuite import scala.concurrent.Future diff --git a/kernel-laws/src/main/scala/cats/kernel/laws/OrderLaws.scala b/kernel-laws/src/main/scala/cats/kernel/laws/OrderLaws.scala index 1f88c8b163..22c47cab7e 100644 --- a/kernel-laws/src/main/scala/cats/kernel/laws/OrderLaws.scala +++ b/kernel-laws/src/main/scala/cats/kernel/laws/OrderLaws.scala @@ -6,7 +6,7 @@ import org.typelevel.discipline.Laws import org.scalacheck.{Arbitrary, Prop} import org.scalacheck.Prop._ -import cats.kernel.std.boolean._ +import cats.kernel.instances.boolean._ object OrderLaws { def apply[A: Eq: Arbitrary]: OrderLaws[A] = new OrderLaws[A] { diff --git a/kernel-laws/src/main/scala/cats/kernel/laws/Rules.scala b/kernel-laws/src/main/scala/cats/kernel/laws/Rules.scala index abeb08d0a5..f4cd717d2b 100644 --- a/kernel-laws/src/main/scala/cats/kernel/laws/Rules.scala +++ b/kernel-laws/src/main/scala/cats/kernel/laws/Rules.scala @@ -4,7 +4,7 @@ package laws import org.scalacheck.Prop import org.scalacheck.Prop._ import org.scalacheck.{Arbitrary, Prop} -import cats.kernel.std.boolean._ +import cats.kernel.instances.boolean._ object Rules { diff --git a/kernel-laws/src/test/scala/cats/kernel/laws/LawTests.scala b/kernel-laws/src/test/scala/cats/kernel/laws/LawTests.scala index 5a9ed774c9..1158ea8140 100644 --- a/kernel-laws/src/test/scala/cats/kernel/laws/LawTests.scala +++ b/kernel-laws/src/test/scala/cats/kernel/laws/LawTests.scala @@ -4,7 +4,7 @@ package laws import catalysts.Platform import catalysts.macros.TypeTagM -import cats.kernel.std.all._ +import cats.kernel.instances.all._ import org.typelevel.discipline.{ Laws } import org.typelevel.discipline.scalatest.Discipline diff --git a/kernel/src/main/scala/cats/kernel/std/Util.scala b/kernel/src/main/scala/cats/kernel/instances/Util.scala similarity index 99% rename from kernel/src/main/scala/cats/kernel/std/Util.scala rename to kernel/src/main/scala/cats/kernel/instances/Util.scala index b36320c8f9..0d48b7d193 100644 --- a/kernel/src/main/scala/cats/kernel/std/Util.scala +++ b/kernel/src/main/scala/cats/kernel/instances/Util.scala @@ -1,5 +1,5 @@ package cats.kernel -package std.util +package instances.util import scala.collection.mutable diff --git a/kernel/src/main/scala/cats/kernel/std/all.scala b/kernel/src/main/scala/cats/kernel/instances/all.scala similarity index 96% rename from kernel/src/main/scala/cats/kernel/std/all.scala rename to kernel/src/main/scala/cats/kernel/instances/all.scala index a7c1528958..3fc5b82b5a 100644 --- a/kernel/src/main/scala/cats/kernel/std/all.scala +++ b/kernel/src/main/scala/cats/kernel/instances/all.scala @@ -1,5 +1,5 @@ package cats.kernel -package std +package instances package object all extends AllInstances diff --git a/kernel/src/main/scala/cats/kernel/std/bigInt.scala b/kernel/src/main/scala/cats/kernel/instances/bigInt.scala similarity index 98% rename from kernel/src/main/scala/cats/kernel/std/bigInt.scala rename to kernel/src/main/scala/cats/kernel/instances/bigInt.scala index 43314a3ceb..0cf236c3a9 100644 --- a/kernel/src/main/scala/cats/kernel/std/bigInt.scala +++ b/kernel/src/main/scala/cats/kernel/instances/bigInt.scala @@ -1,5 +1,5 @@ package cats.kernel -package std +package instances package object bigInt extends BigIntInstances // scalastyle:ignore package.object.name diff --git a/kernel/src/main/scala/cats/kernel/std/boolean.scala b/kernel/src/main/scala/cats/kernel/instances/boolean.scala similarity index 97% rename from kernel/src/main/scala/cats/kernel/std/boolean.scala rename to kernel/src/main/scala/cats/kernel/instances/boolean.scala index 379021a27d..be5ba31c7e 100644 --- a/kernel/src/main/scala/cats/kernel/std/boolean.scala +++ b/kernel/src/main/scala/cats/kernel/instances/boolean.scala @@ -1,5 +1,5 @@ package cats.kernel -package std +package instances package object boolean extends BooleanInstances diff --git a/kernel/src/main/scala/cats/kernel/std/byte.scala b/kernel/src/main/scala/cats/kernel/instances/byte.scala similarity index 98% rename from kernel/src/main/scala/cats/kernel/std/byte.scala rename to kernel/src/main/scala/cats/kernel/instances/byte.scala index 704134fe5c..f50c0895ff 100644 --- a/kernel/src/main/scala/cats/kernel/std/byte.scala +++ b/kernel/src/main/scala/cats/kernel/instances/byte.scala @@ -1,5 +1,5 @@ package cats.kernel -package std +package instances package object byte extends ByteInstances diff --git a/kernel/src/main/scala/cats/kernel/std/char.scala b/kernel/src/main/scala/cats/kernel/instances/char.scala similarity index 97% rename from kernel/src/main/scala/cats/kernel/std/char.scala rename to kernel/src/main/scala/cats/kernel/instances/char.scala index 8b4d309e06..4238fa84ad 100644 --- a/kernel/src/main/scala/cats/kernel/std/char.scala +++ b/kernel/src/main/scala/cats/kernel/instances/char.scala @@ -1,5 +1,5 @@ package cats.kernel -package std +package instances package object char extends CharInstances diff --git a/kernel/src/main/scala/cats/kernel/std/double.scala b/kernel/src/main/scala/cats/kernel/instances/double.scala similarity index 98% rename from kernel/src/main/scala/cats/kernel/std/double.scala rename to kernel/src/main/scala/cats/kernel/instances/double.scala index 7d10e1fd45..93e616cfe4 100644 --- a/kernel/src/main/scala/cats/kernel/std/double.scala +++ b/kernel/src/main/scala/cats/kernel/instances/double.scala @@ -1,5 +1,5 @@ package cats.kernel -package std +package instances import java.lang.Math diff --git a/kernel/src/main/scala/cats/kernel/std/float.scala b/kernel/src/main/scala/cats/kernel/instances/float.scala similarity index 98% rename from kernel/src/main/scala/cats/kernel/std/float.scala rename to kernel/src/main/scala/cats/kernel/instances/float.scala index 3de2d95349..da977b7418 100644 --- a/kernel/src/main/scala/cats/kernel/std/float.scala +++ b/kernel/src/main/scala/cats/kernel/instances/float.scala @@ -1,5 +1,5 @@ package cats.kernel -package std +package instances trait FloatInstances { implicit val catsKernelStdOrderForFloat: Order[Float] = new FloatOrder diff --git a/kernel/src/main/scala/cats/kernel/std/int.scala b/kernel/src/main/scala/cats/kernel/instances/int.scala similarity index 98% rename from kernel/src/main/scala/cats/kernel/std/int.scala rename to kernel/src/main/scala/cats/kernel/instances/int.scala index 41b666b39e..65ffe8ae1e 100644 --- a/kernel/src/main/scala/cats/kernel/std/int.scala +++ b/kernel/src/main/scala/cats/kernel/instances/int.scala @@ -1,5 +1,5 @@ package cats.kernel -package std +package instances package object int extends IntInstances diff --git a/kernel/src/main/scala/cats/kernel/std/list.scala b/kernel/src/main/scala/cats/kernel/instances/list.scala similarity index 99% rename from kernel/src/main/scala/cats/kernel/std/list.scala rename to kernel/src/main/scala/cats/kernel/instances/list.scala index 6de5e369cf..7a5d018956 100644 --- a/kernel/src/main/scala/cats/kernel/std/list.scala +++ b/kernel/src/main/scala/cats/kernel/instances/list.scala @@ -1,5 +1,5 @@ package cats.kernel -package std +package instances import scala.annotation.tailrec import scala.collection.mutable diff --git a/kernel/src/main/scala/cats/kernel/std/long.scala b/kernel/src/main/scala/cats/kernel/instances/long.scala similarity index 98% rename from kernel/src/main/scala/cats/kernel/std/long.scala rename to kernel/src/main/scala/cats/kernel/instances/long.scala index 0e8f498a66..1a4b2dfc7d 100644 --- a/kernel/src/main/scala/cats/kernel/std/long.scala +++ b/kernel/src/main/scala/cats/kernel/instances/long.scala @@ -1,5 +1,5 @@ package cats.kernel -package std +package instances package object long extends LongInstances diff --git a/kernel/src/main/scala/cats/kernel/std/map.scala b/kernel/src/main/scala/cats/kernel/instances/map.scala similarity index 92% rename from kernel/src/main/scala/cats/kernel/std/map.scala rename to kernel/src/main/scala/cats/kernel/instances/map.scala index ad4411fed8..9cee3e655c 100644 --- a/kernel/src/main/scala/cats/kernel/std/map.scala +++ b/kernel/src/main/scala/cats/kernel/instances/map.scala @@ -1,7 +1,7 @@ package cats.kernel -package std +package instances -import cats.kernel.std.util.StaticMethods.addMap +import cats.kernel.instances.util.StaticMethods.addMap package object map extends MapInstances diff --git a/kernel/src/main/scala/cats/kernel/std/option.scala b/kernel/src/main/scala/cats/kernel/instances/option.scala similarity index 99% rename from kernel/src/main/scala/cats/kernel/std/option.scala rename to kernel/src/main/scala/cats/kernel/instances/option.scala index f42a96ec8d..0c1a5229d7 100644 --- a/kernel/src/main/scala/cats/kernel/std/option.scala +++ b/kernel/src/main/scala/cats/kernel/instances/option.scala @@ -1,5 +1,5 @@ package cats.kernel -package std +package instances package object option extends OptionInstances diff --git a/kernel/src/main/scala/cats/kernel/std/set.scala b/kernel/src/main/scala/cats/kernel/instances/set.scala similarity index 97% rename from kernel/src/main/scala/cats/kernel/std/set.scala rename to kernel/src/main/scala/cats/kernel/instances/set.scala index c7012ccf0d..cff59d7ce3 100644 --- a/kernel/src/main/scala/cats/kernel/std/set.scala +++ b/kernel/src/main/scala/cats/kernel/instances/set.scala @@ -1,5 +1,5 @@ package cats.kernel -package std +package instances package object set extends SetInstances diff --git a/kernel/src/main/scala/cats/kernel/std/short.scala b/kernel/src/main/scala/cats/kernel/instances/short.scala similarity index 98% rename from kernel/src/main/scala/cats/kernel/std/short.scala rename to kernel/src/main/scala/cats/kernel/instances/short.scala index 1f63542e40..06f56b028f 100644 --- a/kernel/src/main/scala/cats/kernel/std/short.scala +++ b/kernel/src/main/scala/cats/kernel/instances/short.scala @@ -1,5 +1,5 @@ package cats.kernel -package std +package instances package object short extends ShortInstances diff --git a/kernel/src/main/scala/cats/kernel/std/stream.scala b/kernel/src/main/scala/cats/kernel/instances/stream.scala similarity index 96% rename from kernel/src/main/scala/cats/kernel/std/stream.scala rename to kernel/src/main/scala/cats/kernel/instances/stream.scala index 05fba59126..6fe7215601 100644 --- a/kernel/src/main/scala/cats/kernel/std/stream.scala +++ b/kernel/src/main/scala/cats/kernel/instances/stream.scala @@ -1,7 +1,7 @@ package cats.kernel -package std +package instances -import cats.kernel.std.util.StaticMethods +import cats.kernel.instances.util.StaticMethods package object stream extends StreamInstances diff --git a/kernel/src/main/scala/cats/kernel/std/string.scala b/kernel/src/main/scala/cats/kernel/instances/string.scala similarity index 97% rename from kernel/src/main/scala/cats/kernel/std/string.scala rename to kernel/src/main/scala/cats/kernel/instances/string.scala index 3caad03c93..be4de1fd62 100644 --- a/kernel/src/main/scala/cats/kernel/std/string.scala +++ b/kernel/src/main/scala/cats/kernel/instances/string.scala @@ -1,5 +1,5 @@ package cats.kernel -package std +package instances package object string extends StringInstances diff --git a/kernel/src/main/scala/cats/kernel/std/tuple.scala b/kernel/src/main/scala/cats/kernel/instances/tuple.scala similarity index 78% rename from kernel/src/main/scala/cats/kernel/std/tuple.scala rename to kernel/src/main/scala/cats/kernel/instances/tuple.scala index ce1cb89643..2572ef0e5f 100644 --- a/kernel/src/main/scala/cats/kernel/std/tuple.scala +++ b/kernel/src/main/scala/cats/kernel/instances/tuple.scala @@ -1,4 +1,4 @@ package cats.kernel -package std +package instances package object tuple extends TupleInstances diff --git a/kernel/src/main/scala/cats/kernel/std/unit.scala b/kernel/src/main/scala/cats/kernel/instances/unit.scala similarity index 98% rename from kernel/src/main/scala/cats/kernel/std/unit.scala rename to kernel/src/main/scala/cats/kernel/instances/unit.scala index bc71510f38..068928cfce 100644 --- a/kernel/src/main/scala/cats/kernel/std/unit.scala +++ b/kernel/src/main/scala/cats/kernel/instances/unit.scala @@ -1,5 +1,5 @@ package cats.kernel -package std +package instances package object unit extends UnitInstances diff --git a/kernel/src/main/scala/cats/kernel/std/vector.scala b/kernel/src/main/scala/cats/kernel/instances/vector.scala similarity index 96% rename from kernel/src/main/scala/cats/kernel/std/vector.scala rename to kernel/src/main/scala/cats/kernel/instances/vector.scala index f559ffe7ea..7343cdd7f3 100644 --- a/kernel/src/main/scala/cats/kernel/std/vector.scala +++ b/kernel/src/main/scala/cats/kernel/instances/vector.scala @@ -1,7 +1,7 @@ package cats.kernel -package std +package instances -import cats.kernel.std.util.StaticMethods +import cats.kernel.instances.util.StaticMethods package object vector extends VectorInstances diff --git a/laws/src/main/scala/cats/laws/ArrowLaws.scala b/laws/src/main/scala/cats/laws/ArrowLaws.scala index ffbf0a2b9a..80213ac434 100644 --- a/laws/src/main/scala/cats/laws/ArrowLaws.scala +++ b/laws/src/main/scala/cats/laws/ArrowLaws.scala @@ -2,7 +2,7 @@ package cats package laws import cats.arrow.Arrow -import cats.std.function._ +import cats.instances.function._ import cats.syntax.compose._ import cats.syntax.split._ import cats.syntax.strong._ diff --git a/laws/src/main/scala/cats/laws/StrongLaws.scala b/laws/src/main/scala/cats/laws/StrongLaws.scala index 518d5bcfcf..0125310738 100644 --- a/laws/src/main/scala/cats/laws/StrongLaws.scala +++ b/laws/src/main/scala/cats/laws/StrongLaws.scala @@ -4,7 +4,7 @@ package laws import cats.functor.Strong import cats.syntax.profunctor._ import cats.syntax.strong._ -import cats.std.function._ +import cats.instances.function._ /** * Laws that must be obeyed by any `cats.functor.Strong`. diff --git a/laws/src/main/scala/cats/laws/discipline/Eq.scala b/laws/src/main/scala/cats/laws/discipline/Eq.scala index 955f02edfe..d606d1d9c2 100644 --- a/laws/src/main/scala/cats/laws/discipline/Eq.scala +++ b/laws/src/main/scala/cats/laws/discipline/Eq.scala @@ -3,7 +3,7 @@ package laws package discipline import catalysts.Platform -import cats.std.string._ +import cats.instances.string._ import org.scalacheck.Arbitrary object eq { diff --git a/project/KernelBoiler.scala b/project/KernelBoiler.scala index 733b6bb7e6..c6c0f2fc8e 100644 --- a/project/KernelBoiler.scala +++ b/project/KernelBoiler.scala @@ -80,7 +80,7 @@ object KernelBoiler { object GenTupleInstances extends Template { override def range: IndexedSeq[Int] = 1 to maxArity - def filename(root: File): File = root / "cats" / "kernel" / "std" / "TupleAlgebra.scala" + def filename(root: File): File = root / "cats" / "kernel" / "instances" / "TupleAlgebra.scala" def content(tv: TemplateVals): String = { import tv._ @@ -118,7 +118,7 @@ object KernelBoiler { block""" |package cats.kernel - |package std + |package instances | |trait TupleInstances { - implicit def catsKernelStdBandForTuple${arity}[${`A..N`}](implicit ${constraints("Band")}): Band[${`(A..N)`}] = diff --git a/tests/src/test/scala/cats/tests/CatsSuite.scala b/tests/src/test/scala/cats/tests/CatsSuite.scala index 9f189e8754..ac72c7fc68 100644 --- a/tests/src/test/scala/cats/tests/CatsSuite.scala +++ b/tests/src/test/scala/cats/tests/CatsSuite.scala @@ -3,7 +3,7 @@ package tests import catalysts.Platform -import cats.std.AllInstances +import cats.instances.AllInstances import cats.syntax.{AllSyntax, EqOps} import org.scalactic.anyvals.{PosZDouble, PosInt, PosZInt} diff --git a/tests/src/test/scala/cats/tests/FoldableTests.scala b/tests/src/test/scala/cats/tests/FoldableTests.scala index f0f4b99aca..e5c683fc1a 100644 --- a/tests/src/test/scala/cats/tests/FoldableTests.scala +++ b/tests/src/test/scala/cats/tests/FoldableTests.scala @@ -4,7 +4,7 @@ package tests import org.scalatest.prop.PropertyChecks import org.scalacheck.Arbitrary -import cats.std.all._ +import cats.instances.all._ abstract class FoldableCheck[F[_]: Foldable](name: String)(implicit ArbFInt: Arbitrary[F[Int]]) extends CatsSuite with PropertyChecks { diff --git a/tests/src/test/scala/cats/tests/ListWrapper.scala b/tests/src/test/scala/cats/tests/ListWrapper.scala index 469e55d28e..c00e74ae61 100644 --- a/tests/src/test/scala/cats/tests/ListWrapper.scala +++ b/tests/src/test/scala/cats/tests/ListWrapper.scala @@ -2,7 +2,7 @@ package cats package tests import cats.functor.Invariant -import cats.std.list._ +import cats.instances.list._ import org.scalacheck.Arbitrary import org.scalacheck.Arbitrary.arbitrary diff --git a/tests/src/test/scala/cats/tests/SetTests.scala b/tests/src/test/scala/cats/tests/SetTests.scala index 663151ac5d..3dfb705582 100644 --- a/tests/src/test/scala/cats/tests/SetTests.scala +++ b/tests/src/test/scala/cats/tests/SetTests.scala @@ -22,7 +22,7 @@ class SetTests extends CatsSuite { } test("show keeps separate entries for items that map to identical strings"){ - //note: this val name has to be the same to shadow the cats.std instance + //note: this val name has to be the same to shadow the cats.instances instance implicit val catsStdShowForInt: Show[Int] = Show.show(_ => "1") // an implementation implemented as set.map(_.show).mkString(", ") would // only show one entry in the result instead of 3, because Set.map combines diff --git a/tests/src/test/scala/cats/tests/StateTTests.scala b/tests/src/test/scala/cats/tests/StateTTests.scala index 79f1a37ed1..e7ebd9e290 100644 --- a/tests/src/test/scala/cats/tests/StateTTests.scala +++ b/tests/src/test/scala/cats/tests/StateTTests.scala @@ -2,7 +2,7 @@ package cats package tests import cats.data.{State, StateT} -import cats.kernel.std.tuple._ +import cats.kernel.instances.tuple._ import cats.laws.discipline._ import cats.laws.discipline.eq._ import cats.laws.discipline.arbitrary._ diff --git a/tests/src/test/scala/cats/tests/SyntaxTests.scala b/tests/src/test/scala/cats/tests/SyntaxTests.scala index 0b2f6da46a..1456c72735 100644 --- a/tests/src/test/scala/cats/tests/SyntaxTests.scala +++ b/tests/src/test/scala/cats/tests/SyntaxTests.scala @@ -1,7 +1,7 @@ package cats package tests -import cats.std.AllInstances +import cats.instances.AllInstances import cats.syntax.AllSyntax import cats.functor.{Invariant, Contravariant}