Don't use scalaVersionSpecific helpers in version-specific code

typelevel · Aug 20, 2019 · 40333b2 · 40333b2
1 parent 67dc634
commit 40333b2
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 24 deletions.
diff --git a/core/src/main/scala-2.12-/cats/data/ScalaVersionSpecificPackage.scala b/core/src/main/scala-2.12-/cats/data/ScalaVersionSpecificPackage.scala
@@ -1,15 +1,12 @@
 package cats
 package data
 
-import kernel.compat.scalaVersionSpecific._
-
 abstract private[data] class ScalaVersionSpecificPackage {
   type NonEmptyStream[A] = OneAnd[Stream, A]
 
   def NonEmptyStream[A](head: A, tail: Stream[A] = Stream.empty): NonEmptyStream[A] =
     OneAnd(head, tail)
 
-  @suppressUnusedImportWarningForScalaVersionSpecific
   def NonEmptyStream[A](head: A, tail: A*): NonEmptyStream[A] =
     OneAnd(head, tail.toStream)
 }
diff --git a/core/src/main/scala-2.12-/cats/data/ZipStream.scala b/core/src/main/scala-2.12-/cats/data/ZipStream.scala
@@ -1,11 +1,8 @@
 package cats
 package data
 
-import kernel.compat.scalaVersionSpecific._
-
 class ZipStream[A](val value: Stream[A]) extends AnyVal
 
-@suppressUnusedImportWarningForScalaVersionSpecific
 object ZipStream {
 
   def apply[A](value: Stream[A]): ZipStream[A] = new ZipStream(value)
@@ -18,7 +15,7 @@ object ZipStream {
         ZipStream(fa.value.map(f))
 
       def ap[A, B](ff: ZipStream[A => B])(fa: ZipStream[A]): ZipStream[B] =
-        ZipStream(ff.value.lazyZip(fa.value).map(_.apply(_)))
+        ZipStream((ff.value, fa.value).zipped.map(_.apply(_)))
 
       override def product[A, B](fa: ZipStream[A], fb: ZipStream[B]): ZipStream[(A, B)] =
         ZipStream(fa.value.zip(fb.value))

diff --git a/core/src/main/scala-2.12-/cats/instances/ScalaVersionSpecificParallelInstances.scala b/core/src/main/scala-2.12-/cats/instances/ScalaVersionSpecificParallelInstances.scala
@@ -5,9 +5,7 @@ import cats.data._
 import cats.kernel.Semigroup
 import cats.syntax.either._
 import cats.{~>, Applicative, Apply, FlatMap, Functor, Monad, NonEmptyParallel, Parallel}
-import kernel.compat.scalaVersionSpecific._
 
-@suppressUnusedImportWarningForScalaVersionSpecific
 trait ParallelInstances extends ParallelInstances1 {
   implicit def catsParallelForEitherValidated[E: Semigroup]: Parallel[Either[E, *], Validated[E, *]] =
     new Parallel[Either[E, *], Validated[E, *]] {

diff --git a/core/src/main/scala-2.13+/cats/data/ScalaVersionSpecificPackage.scala b/core/src/main/scala-2.13+/cats/data/ScalaVersionSpecificPackage.scala
@@ -1,8 +1,6 @@
 package cats
 package data
 
-import kernel.compat.scalaVersionSpecific._
-
 abstract private[data] class ScalaVersionSpecificPackage {
   type NonEmptyLazyList[+A] = NonEmptyLazyList.Type[A]
   @deprecated("2.0.0-RC2", "Use NonEmptyLazyList")
@@ -12,7 +10,6 @@ abstract private[data] class ScalaVersionSpecificPackage {
   def NonEmptyStream[A](head: A, tail: Stream[A]): NonEmptyStream[A] =
     OneAnd(head, tail)
 
-  @suppressUnusedImportWarningForScalaVersionSpecific
   @deprecated("2.0.0-RC2", "Use NonEmptyLazyList")
   def NonEmptyStream[A](head: A, tail: A*): NonEmptyStream[A] =
     OneAnd(head, tail.toStream)

diff --git a/core/src/main/scala-2.13+/cats/data/ZipStream.scala b/core/src/main/scala-2.13+/cats/data/ZipStream.scala
@@ -1,12 +1,9 @@
 package cats
 package data
 
-import kernel.compat.scalaVersionSpecific._
-
 @deprecated("2.0.0-RC2", "Use ZipLazyList")
 class ZipStream[A](val value: Stream[A]) extends AnyVal
 
-@suppressUnusedImportWarningForScalaVersionSpecific
 @deprecated("2.0.0-RC2", "Use ZipLazyList")
 object ZipStream {
 

diff --git a/core/src/main/scala-2.13+/cats/instances/ScalaVersionSpecificParallelInstances.scala b/core/src/main/scala-2.13+/cats/instances/ScalaVersionSpecificParallelInstances.scala
@@ -5,9 +5,7 @@ import cats.data._
 import cats.kernel.Semigroup
 import cats.syntax.either._
 import cats.{~>, Applicative, Apply, FlatMap, Functor, Monad, NonEmptyParallel, Parallel}
-import kernel.compat.scalaVersionSpecific._
 
-@suppressUnusedImportWarningForScalaVersionSpecific
 trait ParallelInstances extends ParallelInstances1 {
   implicit def catsParallelForEitherValidated[E: Semigroup]: Parallel[Either[E, *], Validated[E, *]] =
     new Parallel[Either[E, *], Validated[E, *]] {

diff --git a/kernel/src/main/scala-2.12-/cats/kernel/instances/StreamInstances.scala b/kernel/src/main/scala-2.12-/cats/kernel/instances/StreamInstances.scala
@@ -1,8 +1,6 @@
 package cats.kernel
 package instances
-import compat.scalaVersionSpecific._
 
-@suppressUnusedImportWarningForScalaVersionSpecific
 trait StreamInstances extends StreamInstances1 {
   implicit def catsKernelStdOrderForStream[A: Order]: Order[Stream[A]] =
     new StreamOrder[A]
@@ -51,6 +49,6 @@ class StreamMonoid[A] extends Monoid[Stream[A]] {
   override def combineN(x: Stream[A], n: Int): Stream[A] =
     StaticMethods.combineNIterable(Stream.newBuilder[A], x, n)
 
-  override def combineAll(xs: IterableOnce[Stream[A]]): Stream[A] =
+  override def combineAll(xs: TraversableOnce[Stream[A]]): Stream[A] =
     StaticMethods.combineAllIterable(Stream.newBuilder[A], xs)
 }
diff --git a/kernel/src/main/scala-2.13+/cats/kernel/instances/LazyListInstances.scala b/kernel/src/main/scala-2.13+/cats/kernel/instances/LazyListInstances.scala
@@ -1,8 +1,6 @@
 package cats.kernel
 package instances
-import compat.scalaVersionSpecific._
 
-@suppressUnusedImportWarningForScalaVersionSpecific
 trait LazyListInstances extends LazyListInstances1 {
   implicit def catsKernelStdOrderForLazyList[A: Order]: Order[LazyList[A]] =
     new LazyListOrder[A]

diff --git a/kernel/src/main/scala-2.13+/cats/kernel/instances/StreamInstances.scala b/kernel/src/main/scala-2.13+/cats/kernel/instances/StreamInstances.scala
@@ -1,8 +1,6 @@
 package cats.kernel
 package instances
-import compat.scalaVersionSpecific._
 
-@suppressUnusedImportWarningForScalaVersionSpecific
 trait StreamInstances extends StreamInstances1 {
   @deprecated("2.0.0-RC2", "Use cats.kernel.instances.lazyList")
   implicit def catsKernelStdOrderForStream[A: Order]: Order[Stream[A]] =