use & instead of with

Author: xuwei-k

alleycats-core/src/main/scala/alleycats/std/set.scala

@@ -55,7 +55,7 @@ trait SetInstances {
   // If we accept Monad for Set, we can also have Alternative, as
   // Alternative only requires MonoidK (already accepted by cats-core) and
   // the Applicative that comes from Monad.
-  implicit val alleyCatsStdSetMonad: Monad[Set] with Alternative[Set] =
+  implicit val alleyCatsStdSetMonad: Monad[Set] & Alternative[Set] =
     new Monad[Set] with Alternative[Set] {
       def pure[A](a: A): Set[A] = Set(a)
       override def map[A, B](fa: Set[A])(f: A => B): Set[B] = fa.map(f)

core/src/main/scala-2.13+/cats/ScalaVersionSpecificInstances.scala

@@ -67,13 +67,13 @@ private[cats] trait ScalaVersionSpecificParallelInstances {
 
 private[cats] trait ScalaVersionSpecificInvariantInstances {
   @deprecated("Use catsInstancesForLazyList", "3.0.0")
-  implicit def catsInstancesForStream: Monad[Stream] with Alternative[Stream] with CoflatMap[Stream] =
+  implicit def catsInstancesForStream: Monad[Stream] & Alternative[Stream] & CoflatMap[Stream] =
     cats.instances.stream.catsStdInstancesForStream
 
-  implicit def catsInstancesForLazyList: Monad[LazyList] with Alternative[LazyList] with CoflatMap[LazyList] =
+  implicit def catsInstancesForLazyList: Monad[LazyList] & Alternative[LazyList] & CoflatMap[LazyList] =
     cats.instances.lazyList.catsStdInstancesForLazyList
 
-  implicit def catsInstancesForArraySeq: Monad[ArraySeq] with Alternative[ArraySeq] with CoflatMap[ArraySeq] =
+  implicit def catsInstancesForArraySeq: Monad[ArraySeq] & Alternative[ArraySeq] & CoflatMap[ArraySeq] =
     cats.instances.arraySeq.catsStdInstancesForArraySeq
 }
 

core/src/main/scala-2.13+/cats/data/NonEmptyLazyList.scala

@@ -38,7 +38,7 @@ object NonEmptyLazyList extends NonEmptyLazyListInstances {
   private[data] type Base
   private[data] trait Tag extends Any
   /* aliased in data package as NonEmptyLazyList */
-  type Type[+A] <: Base with Tag
+  type Type[+A] <: Base & Tag
 
   private[data] def create[A](s: LazyList[A]): Type[A] =
     s.asInstanceOf[Type[A]]
@@ -510,10 +510,9 @@ class NonEmptyLazyListOps[A](private val value: NonEmptyLazyList[A])
 
 sealed abstract private[data] class NonEmptyLazyListInstances extends NonEmptyLazyListInstances1 {
 
-  implicit val catsDataInstancesForNonEmptyLazyList: Bimonad[NonEmptyLazyList]
-    with NonEmptyTraverse[NonEmptyLazyList]
-    with NonEmptyAlternative[NonEmptyLazyList]
-    with Align[NonEmptyLazyList] =
+  implicit val catsDataInstancesForNonEmptyLazyList: Bimonad[NonEmptyLazyList] & NonEmptyTraverse[
+    NonEmptyLazyList
+  ] & NonEmptyAlternative[NonEmptyLazyList] & Align[NonEmptyLazyList] =
     new AbstractNonEmptyInstances[LazyList, NonEmptyLazyList] with Align[NonEmptyLazyList] {
 
       def extract[A](fa: NonEmptyLazyList[A]): A = fa.head

core/src/main/scala-2.13+/cats/data/ZipLazyList.scala

@@ -28,7 +28,7 @@ object ZipLazyList {
 
   def apply[A](value: LazyList[A]): ZipLazyList[A] = new ZipLazyList(value)
 
-  implicit val catsDataAlternativeForZipLazyList: Alternative[ZipLazyList] with CommutativeApplicative[ZipLazyList] =
+  implicit val catsDataAlternativeForZipLazyList: Alternative[ZipLazyList] & CommutativeApplicative[ZipLazyList] =
     new Alternative[ZipLazyList] with CommutativeApplicative[ZipLazyList] {
       def pure[A](x: A): ZipLazyList[A] = new ZipLazyList(LazyList.continually(x))
 

core/src/main/scala-2.13+/cats/data/ZipStream.scala

@@ -30,7 +30,7 @@ object ZipStream {
 
   def apply[A](value: Stream[A]): ZipStream[A] = new ZipStream(value)
 
-  implicit val catsDataAlternativeForZipStream: Alternative[ZipStream] with CommutativeApplicative[ZipStream] =
+  implicit val catsDataAlternativeForZipStream: Alternative[ZipStream] & CommutativeApplicative[ZipStream] =
     new Alternative[ZipStream] with CommutativeApplicative[ZipStream] {
       def pure[A](x: A): ZipStream[A] = new ZipStream(Stream.continually(x))
 

core/src/main/scala-2.13+/cats/instances/arraySeq.scala

@@ -29,7 +29,7 @@ import scala.collection.mutable.Builder
 
 trait ArraySeqInstances extends cats.kernel.instances.ArraySeqInstances {
   implicit def catsStdInstancesForArraySeq
-    : Traverse[ArraySeq] with Monad[ArraySeq] with Alternative[ArraySeq] with CoflatMap[ArraySeq] with Align[ArraySeq] =
+    : Traverse[ArraySeq] & Monad[ArraySeq] & Alternative[ArraySeq] & CoflatMap[ArraySeq] & Align[ArraySeq] =
     ArraySeqInstances.stdInstances
 
   implicit def catsStdTraverseFilterForArraySeq: TraverseFilter[ArraySeq] =
@@ -41,7 +41,7 @@ trait ArraySeqInstances extends cats.kernel.instances.ArraySeqInstances {
 
 private[cats] object ArraySeqInstances {
   final private val stdInstances
-    : Traverse[ArraySeq] with Monad[ArraySeq] with Alternative[ArraySeq] with CoflatMap[ArraySeq] with Align[ArraySeq] =
+    : Traverse[ArraySeq] & Monad[ArraySeq] & Alternative[ArraySeq] & CoflatMap[ArraySeq] & Align[ArraySeq] =
     new Traverse[ArraySeq]
       with Monad[ArraySeq]
       with Alternative[ArraySeq]

core/src/main/scala-2.13+/cats/instances/lazyList.scala

@@ -34,7 +34,7 @@ import scala.annotation.tailrec
 trait LazyListInstances extends cats.kernel.instances.LazyListInstances {
 
   implicit val catsStdInstancesForLazyList
-    : Traverse[LazyList] with Alternative[LazyList] with Monad[LazyList] with CoflatMap[LazyList] with Align[LazyList] =
+    : Traverse[LazyList] & Alternative[LazyList] & Monad[LazyList] & CoflatMap[LazyList] & Align[LazyList] =
     new Traverse[LazyList]
       with Alternative[LazyList]
       with Monad[LazyList]

core/src/main/scala-2.13+/cats/instances/stream.scala

@@ -33,7 +33,7 @@ trait StreamInstances extends cats.kernel.instances.StreamInstances {
 
   @deprecated("Use cats.instances.lazyList", "2.0.0-RC2")
   implicit val catsStdInstancesForStream
-    : Traverse[Stream] with Alternative[Stream] with Monad[Stream] with CoflatMap[Stream] with Align[Stream] =
+    : Traverse[Stream] & Alternative[Stream] & Monad[Stream] & CoflatMap[Stream] & Align[Stream] =
     new Traverse[Stream] with Alternative[Stream] with Monad[Stream] with CoflatMap[Stream] with Align[Stream] {
 
       def empty[A]: Stream[A] = Stream.Empty

core/src/main/scala/cats/Eval.scala

@@ -389,7 +389,7 @@ object Eval extends EvalInstances {
 
 sealed abstract private[cats] class EvalInstances extends EvalInstances0 {
 
-  implicit val catsBimonadForEval: Bimonad[Eval] with CommutativeMonad[Eval] =
+  implicit val catsBimonadForEval: Bimonad[Eval] & CommutativeMonad[Eval] =
     new Bimonad[Eval] with StackSafeMonad[Eval] with CommutativeMonad[Eval] {
       override def map[A, B](fa: Eval[A])(f: A => B): Eval[B] = fa.map(f)
       def pure[A](a: A): Eval[A] = Now(a)

core/src/main/scala/cats/Invariant.scala

@@ -124,8 +124,7 @@ trait Invariant[F[_]] extends Serializable { self =>
 
 @suppressUnusedImportWarningForScalaVersionSpecific
 object Invariant extends ScalaVersionSpecificInvariantInstances with InvariantInstances0 {
-  implicit def catsInstancesForId
-    : Distributive[Id] with Bimonad[Id] with CommutativeMonad[Id] with NonEmptyTraverse[Id] =
+  implicit def catsInstancesForId: Distributive[Id] & Bimonad[Id] & CommutativeMonad[Id] & NonEmptyTraverse[Id] =
     cats.catsInstancesForId
   @deprecated("Added for bincompat", "2.8.0")
   @targetName3("catsInstancesForId")
@@ -134,13 +133,13 @@ object Invariant extends ScalaVersionSpecificInvariantInstances with InvariantIn
   implicit def catsMonadErrorForEither[A]: MonadError[Either[A, *], A] =
     cats.instances.either.catsStdInstancesForEither[A]
   implicit def catsInstancesForOption
-    : MonadError[Option, Unit] with Alternative[Option] with CoflatMap[Option] with CommutativeMonad[Option] =
+    : MonadError[Option, Unit] & Alternative[Option] & CoflatMap[Option] & CommutativeMonad[Option] =
     cats.instances.option.catsStdInstancesForOption
-  implicit def catsInstancesForList: Monad[List] with Alternative[List] with CoflatMap[List] =
+  implicit def catsInstancesForList: Monad[List] & Alternative[List] & CoflatMap[List] =
     cats.instances.list.catsStdInstancesForList
-  implicit def catsInstancesForVector: Monad[Vector] with Alternative[Vector] with CoflatMap[Vector] =
+  implicit def catsInstancesForVector: Monad[Vector] & Alternative[Vector] & CoflatMap[Vector] =
     cats.instances.vector.catsStdInstancesForVector
-  implicit def catsInstancesForQueue: Monad[Queue] with Alternative[Queue] with CoflatMap[Queue] =
+  implicit def catsInstancesForQueue: Monad[Queue] & Alternative[Queue] & CoflatMap[Queue] =
     cats.instances.queue.catsStdInstancesForQueue
   implicit def catsMonadForTailRec: Monad[TailRec] = cats.instances.tailRec.catsInstancesForTailRec
 
@@ -152,7 +151,7 @@ object Invariant extends ScalaVersionSpecificInvariantInstances with InvariantIn
     cats.instances.function.catsStdContravariantMonoidalForFunction1[R]
   implicit def catsFunctorForPair: Functor[λ[P => (P, P)]] = cats.instances.tuple.catsDataFunctorForPair
 
-  implicit def catsInstancesForTry: MonadThrow[Try] with CoflatMap[Try] =
+  implicit def catsInstancesForTry: MonadThrow[Try] & CoflatMap[Try] =
     cats.instances.try_.catsStdInstancesForTry
 
   /**
@@ -166,7 +165,7 @@ object Invariant extends ScalaVersionSpecificInvariantInstances with InvariantIn
    */
   implicit def catsInstancesForFuture(implicit
     ec: ExecutionContext
-  ): MonadThrow[Future] with CoflatMap[Future] =
+  ): MonadThrow[Future] & CoflatMap[Future] =
     cats.instances.future.catsStdInstancesForFuture(ec)
 
   implicit def catsContravariantMonoidalForOrder: ContravariantMonoidal[Order] =
@@ -339,7 +338,7 @@ private trait InvariantInstances1 extends InvariantInstances2 {
 private[cats] trait InvariantInstances2 extends cats.instances.NTupleMonadInstances with TupleInstances0 {
   implicit def catsApplicativeForArrow[F[_, _], A](implicit F: Arrow[F]): Applicative[F[A, *]] =
     new ArrowApplicative[F, A](F)
-  implicit def catsInstancesForSeq: Monad[Seq] with Alternative[Seq] with CoflatMap[Seq] =
+  implicit def catsInstancesForSeq: Monad[Seq] & Alternative[Seq] & CoflatMap[Seq] =
     cats.instances.seq.catsStdInstancesForSeq
 }