From b44f2545144f3d6c46625e90209517ed29cfccc4 Mon Sep 17 00:00:00 2001 From: Kevin Lee Date: Tue, 7 Apr 2020 23:28:42 +1000 Subject: [PATCH] Close #33 - Change pureEffect to effectOfPure --- .../src/main/scala/effectie/cats/EffectConstructor.scala | 2 +- .../src/main/scala/effectie/cats/EitherTSupport.scala | 8 ++++---- .../src/main/scala/effectie/cats/OptionTSupport.scala | 8 ++++---- core/src/main/scala/effectie/EffectConstructor.scala | 2 +- core/src/main/scala/effectie/Effectful.scala | 2 +- .../main/scala/effectie/scalaz/EffectConstructor.scala | 2 +- .../src/main/scala/effectie/scalaz/EitherTSupport.scala | 8 ++++---- .../src/main/scala/effectie/scalaz/OptionTSupport.scala | 8 ++++---- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cats-effect/src/main/scala/effectie/cats/EffectConstructor.scala b/cats-effect/src/main/scala/effectie/cats/EffectConstructor.scala index c48d19b1..d2c007e8 100644 --- a/cats-effect/src/main/scala/effectie/cats/EffectConstructor.scala +++ b/cats-effect/src/main/scala/effectie/cats/EffectConstructor.scala @@ -11,7 +11,7 @@ object EffectConstructor { override def effectOf[A](a: => A): IO[A] = IO(a) - override def pureEffect[A](a: A): IO[A] = IO.pure(a) + override def effectOfPure[A](a: A): IO[A] = IO.pure(a) override def unit: IO[Unit] = IO.unit } diff --git a/cats-effect/src/main/scala/effectie/cats/EitherTSupport.scala b/cats-effect/src/main/scala/effectie/cats/EitherTSupport.scala index 62fa12a4..f4d3f2a5 100644 --- a/cats-effect/src/main/scala/effectie/cats/EitherTSupport.scala +++ b/cats-effect/src/main/scala/effectie/cats/EitherTSupport.scala @@ -9,14 +9,14 @@ trait EitherTSupport { def eitherTEffect[F[_] : EffectConstructor, A, B](ab: => Either[A, B]): EitherT[F, A, B] = EitherT(EffectConstructor[F].effectOf(ab)) - def eitherTPureEffect[F[_] : EffectConstructor, A, B](ab: Either[A, B]): EitherT[F, A, B] = - EitherT(EffectConstructor[F].pureEffect(ab)) + def eitherTEffectOfPure[F[_] : EffectConstructor, A, B](ab: Either[A, B]): EitherT[F, A, B] = + EitherT(EffectConstructor[F].effectOfPure(ab)) def eitherTLiftEffect[F[_] : EffectConstructor : Functor, A, B](b: => B): EitherT[F, A, B] = EitherT.liftF[F, A, B](EffectConstructor[F].effectOf(b)) - def eitherTLiftPureEffect[F[_] : EffectConstructor, A, B](b: B): EitherT[F, A, B] = - EitherT(EffectConstructor[F].pureEffect(b.asRight[A])) + def eitherTLiftEffectOfPure[F[_] : EffectConstructor, A, B](b: B): EitherT[F, A, B] = + EitherT(EffectConstructor[F].effectOfPure(b.asRight[A])) def eitherTLiftF[F[_] : EffectConstructor : Functor, A, B](fb: F[B]): EitherT[F, A, B] = EitherT.liftF[F, A, B](fb) diff --git a/cats-effect/src/main/scala/effectie/cats/OptionTSupport.scala b/cats-effect/src/main/scala/effectie/cats/OptionTSupport.scala index 0487fa3b..9c13d9a5 100644 --- a/cats-effect/src/main/scala/effectie/cats/OptionTSupport.scala +++ b/cats-effect/src/main/scala/effectie/cats/OptionTSupport.scala @@ -9,14 +9,14 @@ trait OptionTSupport { def optionTEffect[F[_] : EffectConstructor, A](a: => Option[A]): OptionT[F, A] = OptionT(EffectConstructor[F].effectOf(a)) - def optionTPureEffect[F[_] : EffectConstructor, A](a: Option[A]): OptionT[F, A] = - OptionT(EffectConstructor[F].pureEffect(a)) + def optionTEffectOfPure[F[_] : EffectConstructor, A](a: Option[A]): OptionT[F, A] = + OptionT(EffectConstructor[F].effectOfPure(a)) def optionTLiftEffect[F[_] : EffectConstructor : Functor, A](a: => A): OptionT[F, A] = OptionT.liftF[F, A](EffectConstructor[F].effectOf(a)) - def optionTLiftPureEffect[F[_] : EffectConstructor, A](a: A): OptionT[F, A] = - OptionT(EffectConstructor[F].pureEffect(a.some)) + def optionTLiftEffectOfPure[F[_] : EffectConstructor, A](a: A): OptionT[F, A] = + OptionT(EffectConstructor[F].effectOfPure(a.some)) def optionTLiftF[F[_] : EffectConstructor : Functor, A](fa: F[A]): OptionT[F, A] = OptionT.liftF[F, A](fa) diff --git a/core/src/main/scala/effectie/EffectConstructor.scala b/core/src/main/scala/effectie/EffectConstructor.scala index 69139bff..ad1d9825 100644 --- a/core/src/main/scala/effectie/EffectConstructor.scala +++ b/core/src/main/scala/effectie/EffectConstructor.scala @@ -2,7 +2,7 @@ package effectie trait EffectConstructor[F[_]] { def effectOf[A](a: => A): F[A] - def pureEffect[A](a: A): F[A] + def effectOfPure[A](a: A): F[A] def unit: F[Unit] } diff --git a/core/src/main/scala/effectie/Effectful.scala b/core/src/main/scala/effectie/Effectful.scala index be9ec6f6..d7e87862 100644 --- a/core/src/main/scala/effectie/Effectful.scala +++ b/core/src/main/scala/effectie/Effectful.scala @@ -4,7 +4,7 @@ trait Effectful { def effectOf[F[_] : EffectConstructor, A](a: => A): F[A] = EffectConstructor[F].effectOf(a) - def pureEffect[F[_] : EffectConstructor, A](a: A): F[A] = EffectConstructor[F].pureEffect(a) + def effectOfPure[F[_] : EffectConstructor, A](a: A): F[A] = EffectConstructor[F].effectOfPure(a) def effectUnit[F[_] : EffectConstructor]: F[Unit] = EffectConstructor[F].unit diff --git a/scalaz-effect/src/main/scala/effectie/scalaz/EffectConstructor.scala b/scalaz-effect/src/main/scala/effectie/scalaz/EffectConstructor.scala index 64100635..79f4a3c3 100644 --- a/scalaz-effect/src/main/scala/effectie/scalaz/EffectConstructor.scala +++ b/scalaz-effect/src/main/scala/effectie/scalaz/EffectConstructor.scala @@ -12,7 +12,7 @@ object EffectConstructor { override def effectOf[A](a: => A): IO[A] = IO(a) - override def pureEffect[A](a: A): IO[A] = Monad[IO].pure(a) + override def effectOfPure[A](a: A): IO[A] = Monad[IO].pure(a) override def unit: IO[Unit] = IO.ioUnit } diff --git a/scalaz-effect/src/main/scala/effectie/scalaz/EitherTSupport.scala b/scalaz-effect/src/main/scala/effectie/scalaz/EitherTSupport.scala index e7d567f6..8d5bb5b2 100644 --- a/scalaz-effect/src/main/scala/effectie/scalaz/EitherTSupport.scala +++ b/scalaz-effect/src/main/scala/effectie/scalaz/EitherTSupport.scala @@ -7,14 +7,14 @@ trait EitherTSupport { def eitherTEffect[F[_] : EffectConstructor, A, B](ab: => A \/ B): EitherT[F, A, B] = EitherT(EffectConstructor[F].effectOf(ab)) - def eitherTPureEffect[F[_] : EffectConstructor, A, B](ab: A \/ B): EitherT[F, A, B] = - EitherT(EffectConstructor[F].pureEffect(ab)) + def eitherTEffectOfPure[F[_] : EffectConstructor, A, B](ab: A \/ B): EitherT[F, A, B] = + EitherT(EffectConstructor[F].effectOfPure(ab)) def eitherTLiftEffect[F[_] : EffectConstructor : Functor, A, B](b: => B): EitherT[F, A, B] = EitherT.rightT[F, A, B](EffectConstructor[F].effectOf(b)) - def eitherTLiftPureEffect[F[_] : EffectConstructor : Functor, A, B](b: B): EitherT[F, A, B] = - EitherT.rightT[F, A, B](EffectConstructor[F].pureEffect(b)) + def eitherTLiftEffectOfPure[F[_] : EffectConstructor : Functor, A, B](b: B): EitherT[F, A, B] = + EitherT.rightT[F, A, B](EffectConstructor[F].effectOfPure(b)) def eitherTLiftF[F[_] : EffectConstructor : Functor, A, B](fb: F[B]): EitherT[F, A, B] = EitherT.rightT[F, A, B](fb) diff --git a/scalaz-effect/src/main/scala/effectie/scalaz/OptionTSupport.scala b/scalaz-effect/src/main/scala/effectie/scalaz/OptionTSupport.scala index e3aab8e6..c309eec1 100644 --- a/scalaz-effect/src/main/scala/effectie/scalaz/OptionTSupport.scala +++ b/scalaz-effect/src/main/scala/effectie/scalaz/OptionTSupport.scala @@ -8,14 +8,14 @@ trait OptionTSupport { def optionTEffect[F[_] : EffectConstructor, A](a: => Option[A]): OptionT[F, A] = OptionT(EffectConstructor[F].effectOf(a)) - def optionTPureEffect[F[_] : EffectConstructor, A](a: Option[A]): OptionT[F, A] = - OptionT(EffectConstructor[F].pureEffect(a)) + def optionTEffectOfPure[F[_] : EffectConstructor, A](a: Option[A]): OptionT[F, A] = + OptionT(EffectConstructor[F].effectOfPure(a)) def optionTLiftEffect[F[_] : EffectConstructor : Functor, A](a: => A): OptionT[F, A] = OptionT(EffectConstructor[F].effectOf(a).map(_.some)) - def optionTLiftPureEffect[F[_] : EffectConstructor, A](a: A): OptionT[F, A] = - OptionT(EffectConstructor[F].pureEffect(a.some)) + def optionTLiftEffectOfPure[F[_] : EffectConstructor, A](a: A): OptionT[F, A] = + OptionT(EffectConstructor[F].effectOfPure(a.some)) def optionTLiftF[F[_] : EffectConstructor : Functor, A](fa: F[A]): OptionT[F, A] = OptionT(fa.map(_.some))