Merge pull request #4751 from joroKr21/abstract-classes

Reduce jar size by using abstract classes

Author: satorg

core/src/main/scala-2.12/cats/instances/all.scala

@@ -23,7 +23,7 @@ package cats
 package instances
 
 abstract class AllInstancesBinCompat
-    extends AllInstances
+    extends AbstractAllInstances
     with AllInstancesBinCompat0
     with AllInstancesBinCompat1
     with AllInstancesBinCompat2
@@ -34,6 +34,8 @@ abstract class AllInstancesBinCompat
     with AllInstancesBinCompat7
     with AllInstancesBinCompat8
 
+abstract private[cats] class AbstractAllInstances extends AbstractAnyValInstances with AllInstances
+
 trait AllInstances
     extends AnyValInstances
     with BigIntInstances

core/src/main/scala-2.12/cats/instances/package.scala

@@ -77,7 +77,7 @@ package object instances {
   object string extends StringInstances
   object tailRec extends TailRecInstances
   object try_ extends TryInstances
-  object tuple extends TupleInstances with Tuple2InstancesBinCompat0
+  object tuple extends AbstractTupleInstances with Tuple2InstancesBinCompat0
   object unit extends UnitInstances
   object uuid extends UUIDInstances
   object vector extends VectorInstances with VectorInstancesBinCompat0

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

@@ -514,7 +514,6 @@ sealed abstract private[data] class NonEmptyLazyListInstances extends NonEmptyLa
     NonEmptyLazyList
   ] & NonEmptyAlternative[NonEmptyLazyList] & Align[NonEmptyLazyList] =
     new AbstractNonEmptyInstances[LazyList, NonEmptyLazyList] with Align[NonEmptyLazyList] {
-
       def extract[A](fa: NonEmptyLazyList[A]): A = fa.head
 
       def nonEmptyTraverse[G[_]: Apply, A, B](fa: NonEmptyLazyList[A])(f: A => G[B]): G[NonEmptyLazyList[B]] = {
@@ -526,9 +525,12 @@ sealed abstract private[data] class NonEmptyLazyListInstances extends NonEmptyLa
         loop(fa.head, fa.tail).value
       }
 
-      def reduceLeftTo[A, B](fa: NonEmptyLazyList[A])(f: A => B)(g: (B, A) => B): B = fa.reduceLeftTo(f)(g)
+      override def reduceLeftTo[A, B](fa: NonEmptyLazyList[A])(f: A => B)(g: (B, A) => B): B =
+        fa.reduceLeftTo(f)(g)
 
-      def reduceRightTo[A, B](fa: NonEmptyLazyList[A])(f: A => B)(g: (A, cats.Eval[B]) => cats.Eval[B]): cats.Eval[B] =
+      override def reduceRightTo[A, B](
+        fa: NonEmptyLazyList[A]
+      )(f: A => B)(g: (A, cats.Eval[B]) => cats.Eval[B]): cats.Eval[B] =
         fa.tail match {
           case head +: tail =>
             val nell = NonEmptyLazyList.fromLazyListPrepend(head, tail)

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

@@ -29,7 +29,7 @@ object ZipLazyList {
   def apply[A](value: LazyList[A]): ZipLazyList[A] = new ZipLazyList(value)
 
   implicit val catsDataAlternativeForZipLazyList: Alternative[ZipLazyList] & CommutativeApplicative[ZipLazyList] =
-    new Alternative[ZipLazyList] with CommutativeApplicative[ZipLazyList] {
+    new Apply.AbstractApply[ZipLazyList] with Alternative[ZipLazyList] with CommutativeApplicative[ZipLazyList] {
       def pure[A](x: A): ZipLazyList[A] = new ZipLazyList(LazyList.continually(x))
 
       override def map[A, B](fa: ZipLazyList[A])(f: (A) => B): ZipLazyList[B] =

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

@@ -31,7 +31,7 @@ object ZipStream {
   def apply[A](value: Stream[A]): ZipStream[A] = new ZipStream(value)
 
   implicit val catsDataAlternativeForZipStream: Alternative[ZipStream] & CommutativeApplicative[ZipStream] =
-    new Alternative[ZipStream] with CommutativeApplicative[ZipStream] {
+    new Apply.AbstractApply[ZipStream] with Alternative[ZipStream] with CommutativeApplicative[ZipStream] {
       def pure[A](x: A): ZipStream[A] = new ZipStream(Stream.continually(x))
 
       override def map[A, B](fa: ZipStream[A])(f: (A) => B): ZipStream[B] =

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

@@ -23,7 +23,7 @@ package cats
 package instances
 
 abstract class AllInstancesBinCompat
-    extends AllInstances
+    extends AbstractAllInstances
     with AllInstancesBinCompat0
     with AllInstancesBinCompat1
     with AllInstancesBinCompat2
@@ -35,6 +35,8 @@ abstract class AllInstancesBinCompat
     with AllInstancesBinCompat8
     with AllInstancesBinCompat9
 
+abstract private[cats] class AbstractAllInstances extends AbstractAnyValInstances with AllInstances
+
 trait AllInstances
     extends AnyValInstances
     with ArraySeqInstances

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

@@ -42,11 +42,13 @@ trait ArraySeqInstances extends cats.kernel.instances.ArraySeqInstances {
 private[cats] object ArraySeqInstances {
   final private val stdInstances
     : Traverse[ArraySeq] & Monad[ArraySeq] & Alternative[ArraySeq] & CoflatMap[ArraySeq] & Align[ArraySeq] =
-    new Traverse[ArraySeq]
+    new FlatMap.AbstractFoldableFlatMap[ArraySeq]
+      with Traverse[ArraySeq]
       with Monad[ArraySeq]
       with Alternative[ArraySeq]
       with CoflatMap[ArraySeq]
       with Align[ArraySeq] {
+
       def empty[A]: ArraySeq[A] =
         ArraySeq.untagged.empty
 

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

@@ -35,7 +35,8 @@ trait LazyListInstances extends cats.kernel.instances.LazyListInstances {
 
   implicit val catsStdInstancesForLazyList
     : Traverse[LazyList] & Alternative[LazyList] & Monad[LazyList] & CoflatMap[LazyList] & Align[LazyList] =
-    new Traverse[LazyList]
+    new FlatMap.AbstractFoldableFlatMap[LazyList]
+      with Traverse[LazyList]
       with Alternative[LazyList]
       with Monad[LazyList]
       with CoflatMap[LazyList]

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

@@ -81,7 +81,7 @@ package object instances {
   object string extends StringInstances
   object tailRec extends TailRecInstances
   object try_ extends TryInstances
-  object tuple extends TupleInstances with Tuple2InstancesBinCompat0
+  object tuple extends AbstractTupleInstances with Tuple2InstancesBinCompat0
   object unit extends UnitInstances
   object uuid extends UUIDInstances
   object vector extends VectorInstances with VectorInstancesBinCompat0

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

@@ -34,7 +34,12 @@ trait StreamInstances extends cats.kernel.instances.StreamInstances {
   @deprecated("Use cats.instances.lazyList", "2.0.0-RC2")
   implicit val catsStdInstancesForStream
     : 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] {
+    new FlatMap.AbstractFoldableFlatMap[Stream]
+      with Traverse[Stream]
+      with Alternative[Stream]
+      with Monad[Stream]
+      with CoflatMap[Stream]
+      with Align[Stream] {
 
       def empty[A]: Stream[A] = Stream.Empty