Sitelet https://github.com/typelevel/cats/commit/9a8fa23599eb3d62c345396641ab0ffaff9f7ee0
Skip to content

Commit 9a8fa23

Browse files
joroKr21joroKr21
committed
Convert Show instances to SAM syntax
1 parent e5c3c3a commit 9a8fa23

33 files changed

Lines changed: 52 additions & 75 deletions

‎core/src/main/scala-2.12/cats/instances/stream.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ trait StreamInstances extends cats.kernel.instances.StreamInstances {
194194
}
195195

196196
implicit def catsStdShowForStream[A: Show]: Show[Stream[A]] =
197-
Show.show(stream => if (stream.isEmpty) "Stream()" else s"Stream(${stream.head.show}, ?)")
197+
stream => if (stream.isEmpty) "Stream()" else s"Stream(${stream.head.show}, ?)"
198198

199199
implicit def catsStdParallelForStreamZipStream: Parallel.Aux[Stream, ZipStream] =
200200
new Parallel[Stream] {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,7 @@ sealed abstract private[data] class NonEmptyLazyListInstances extends NonEmptyLa
553553
implicit def catsDataSemigroupForNonEmptyLazyList[A]: Semigroup[NonEmptyLazyList[A]] =
554554
Semigroup[LazyList[A]].asInstanceOf[Semigroup[NonEmptyLazyList[A]]]
555555

556-
implicit def catsDataShowForNonEmptyLazyList[A](implicit A: Show[A]): Show[NonEmptyLazyList[A]] =
557-
Show.show[NonEmptyLazyList[A]](_.show)
556+
implicit def catsDataShowForNonEmptyLazyList[A: Show]: Show[NonEmptyLazyList[A]] = _.show
558557

559558
implicit def catsDataParallelForNonEmptyLazyList: Parallel.Aux[NonEmptyLazyList, OneAnd[ZipLazyList, *]] =
560559
new Parallel[NonEmptyLazyList] {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ trait ArraySeqInstances extends cats.kernel.instances.ArraySeqInstances {
3636
ArraySeqInstances.stdTraverseFilterInstance
3737

3838
implicit def catsStdShowForArraySeq[A](implicit ev: Show[A]): Show[ArraySeq[A]] =
39-
Show.show { arraySeq =>
40-
arraySeq.iterator.map(ev.show).mkString("ArraySeq(", ", ", ")")
41-
}
39+
_.iterator.map(ev.show).mkString("ArraySeq(", ", ", ")")
4240
}
4341

4442
private[cats] object ArraySeqInstances {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ trait LazyListInstances extends cats.kernel.instances.LazyListInstances {
176176
}
177177

178178
implicit def catsStdShowForLazyList[A: Show]: Show[LazyList[A]] =
179-
Show.show(list => if (list.isEmpty) "LazyList()" else s"LazyList(${list.head.show}, ?)")
179+
list => if (list.isEmpty) "LazyList()" else s"LazyList(${list.head.show}, ?)"
180180

181181
implicit val catsStdTraverseFilterForLazyList: TraverseFilter[LazyList] = new TraverseFilter[LazyList] {
182182
val traverse: Traverse[LazyList] = catsStdInstancesForLazyList

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ trait StreamInstances extends cats.kernel.instances.StreamInstances {
196196

197197
@deprecated("Use cats.instances.lazyList", "2.0.0-RC2")
198198
implicit def catsStdShowForStream[A: Show]: Show[Stream[A]] =
199-
Show.show(stream => if (stream.isEmpty) "Stream()" else s"Stream(${stream.head.show}, ?)")
199+
stream => if (stream.isEmpty) "Stream()" else s"Stream(${stream.head.show}, ?)"
200200

201201
@deprecated("Use catsStdParallelForZipLazyList", "2.0.0-RC2")
202202
implicit def catsStdParallelForStreamZipStream: Parallel.Aux[Stream, ZipStream] =

‎core/src/main/scala/cats/Show.scala‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ object Show extends ScalaVersionSpecificShowInstances with ShowInstances {
8080
}
8181

8282
implicit val catsContravariantForShow: Contravariant[Show] = new Contravariant[Show] {
83-
def contramap[A, B](fa: Show[A])(f: B => A): Show[B] =
84-
show[B]((fa.show _).compose(f))
83+
def contramap[A, B](fa: Show[A])(f: B => A): Show[B] = b => fa.show(f(b))
8584
}
8685

8786
implicit def catsShowForUnit: Show[Unit] = cats.instances.unit.catsStdShowForUnit

‎core/src/main/scala/cats/data/Chain.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,8 @@ sealed abstract class Chain[+A] extends ChainCompat[A] {
858858
def hash[AA >: A](implicit hashA: Hash[AA]): Int =
859859
KernelStaticMethods.orderedHash((this: Chain[AA]).iterator)
860860

861-
override def toString: String = show(Show.show[A](_.toString))
861+
override def toString: String =
862+
show(Show.fromToString)
862863

863864
override def equals(o: Any): Boolean =
864865
o match {
@@ -1320,8 +1321,7 @@ sealed abstract private[data] class ChainInstances extends ChainInstances1 {
13201321
}
13211322
}
13221323

1323-
implicit def catsDataShowForChain[A](implicit A: Show[A]): Show[Chain[A]] =
1324-
Show.show[Chain[A]](_.show)
1324+
implicit def catsDataShowForChain[A: Show]: Show[Chain[A]] = _.show
13251325

13261326
implicit def catsDataOrderForChain[A](implicit A0: Order[A]): Order[Chain[A]] =
13271327
new Order[Chain[A]] with ChainPartialOrder[A] {

‎core/src/main/scala/cats/data/Const.scala‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ sealed abstract private[data] class ConstInstances extends ConstInstances0 {
100100
def functor: Functor[Const[A, *]] = catsDataFunctorForConst
101101
}
102102

103-
implicit def catsDataShowForConst[A: Show, B]: Show[Const[A, B]] =
104-
Show.show(_.show)
103+
implicit def catsDataShowForConst[A: Show, B]: Show[Const[A, B]] = _.show
105104

106105
implicit def catsDataTraverseForConst[C]: Traverse[Const[C, *]] =
107106
new Traverse[Const[C, *]] {

‎core/src/main/scala/cats/data/Ior.scala‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -860,8 +860,7 @@ sealed abstract private[data] class IorInstances extends IorInstances0 {
860860
implicit def catsDataOrderForIor[A: Order, B: Order]: Order[A Ior B] =
861861
Order.from(_ compare _)
862862

863-
implicit def catsDataShowForIor[A: Show, B: Show]: Show[A Ior B] =
864-
Show.show(_.show)
863+
implicit def catsDataShowForIor[A: Show, B: Show]: Show[A Ior B] = _.show
865864

866865
implicit def catsDataSemigroupForIor[A: Semigroup, B: Semigroup]: Semigroup[Ior[A, B]] =
867866
Semigroup.instance(_ combine _)

‎core/src/main/scala/cats/data/NonEmptyChain.scala‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -682,9 +682,7 @@ sealed abstract private[data] class NonEmptyChainInstances extends NonEmptyChain
682682
implicit def catsDataSemigroupForNonEmptyChain[A]: Semigroup[NonEmptyChain[A]] =
683683
Semigroup[Chain[A]].asInstanceOf[Semigroup[NonEmptyChain[A]]]
684684

685-
implicit def catsDataShowForNonEmptyChain[A](implicit A: Show[A]): Show[NonEmptyChain[A]] =
686-
Show.show[NonEmptyChain[A]](_.show)
687-
685+
implicit def catsDataShowForNonEmptyChain[A: Show]: Show[NonEmptyChain[A]] = _.show
688686
}
689687

690688
sealed abstract private[data] class NonEmptyChainInstances1 extends NonEmptyChainInstances2 {

0 commit comments

Comments
 (0)