@@ -15,7 +15,7 @@ abstract class Rerunnable[+A] { self =>
1515
1616 final def fa : Rerunnable [A ] = self
1717 final def ff : Try [A ] => Rerunnable [B ] = {
18- case Return (a) => Rerunnable .const[B ](f(a))
18+ case Return (a) => Rerunnable .const[B ](f(a))
1919 case Throw (error) => Rerunnable .raiseError[B ](error)
2020 }
2121 }
@@ -25,7 +25,7 @@ abstract class Rerunnable[+A] { self =>
2525
2626 final def fa : Rerunnable [A ] = self
2727 final def ff : Try [A ] => Rerunnable [B ] = {
28- case Return (a) => f(a)
28+ case Return (a) => f(a)
2929 case Throw (error) => Rerunnable .raiseError[B ](error)
3030 }
3131 }
@@ -39,15 +39,16 @@ abstract class Rerunnable[+A] { self =>
3939
4040 final def fa : Rerunnable [A ] = self
4141 final def ff : Try [A ] => Rerunnable [(A , B )] = {
42- case Return (a) => new Rerunnable .Bind [(A , B )] {
43- type P = B
44-
45- final def fa : Rerunnable [B ] = other
46- final def ff : Try [B ] => Rerunnable [(A , B )] = {
47- case Return (b) => Rerunnable .const((a, b))
48- case Throw (error) => Rerunnable .raiseError[(A , B )](error)
42+ case Return (a) =>
43+ new Rerunnable .Bind [(A , B )] {
44+ type P = B
45+
46+ final def fa : Rerunnable [B ] = other
47+ final def ff : Try [B ] => Rerunnable [(A , B )] = {
48+ case Return (b) => Rerunnable .const((a, b))
49+ case Throw (error) => Rerunnable .raiseError[(A , B )](error)
50+ }
4951 }
50- }
5152 case Throw (error) => Rerunnable .raiseError[(A , B )](error)
5253 }
5354 }
@@ -68,12 +69,13 @@ final object Rerunnable extends RerunnableInstances1 {
6869 final type P = inner.P
6970
7071 final def fa : Rerunnable [P ] = inner.fa
71- final def ff : Try [P ] => Rerunnable [B ] = p => new Bind [B ] {
72- final type P = bind.P
72+ final def ff : Try [P ] => Rerunnable [B ] = p =>
73+ new Bind [B ] {
74+ final type P = bind.P
7375
74- final val fa : Rerunnable [P ] = inner.ff(p)
75- final val ff : Try [P ] => Rerunnable [B ] = bind.ff
76- }
76+ final val fa : Rerunnable [P ] = inner.ff(p)
77+ final val ff : Try [P ] => Rerunnable [B ] = bind.ff
78+ }
7779 }
7880
7981 reassociate(next)
@@ -170,19 +172,18 @@ private[util] class RerunnableMonadError extends MonadError[Rerunnable, Throwabl
170172 }
171173
172174 override final def attempt [A ](fa : Rerunnable [A ]): Rerunnable [Either [Throwable , A ]] = fa.liftToTry.map {
173- case Return (a) => Right [Throwable , A ](a)
175+ case Return (a) => Right [Throwable , A ](a)
174176 case Throw (err) => Left [Throwable , A ](err)
175177 }
176178
177179 final def tailRecM [A , B ](a : A )(f : A => Rerunnable [Either [A , B ]]): Rerunnable [B ] = f(a).flatMap {
178- case Right (b) => pure(b)
180+ case Right (b) => pure(b)
179181 case Left (nextA) => tailRecM(nextA)(f)
180182 }
181183}
182184
183- private [util] sealed class RerunnableSemigroup [A ](implicit A : Semigroup [A ])
184- extends Semigroup [Rerunnable [A ]] {
185- final def combine (fx : Rerunnable [A ], fy : Rerunnable [A ]): Rerunnable [A ] = fx.product(fy).map {
186- case (x, y) => A .combine(x, y)
187- }
185+ private [util] sealed class RerunnableSemigroup [A ](implicit A : Semigroup [A ]) extends Semigroup [Rerunnable [A ]] {
186+ final def combine (fx : Rerunnable [A ], fy : Rerunnable [A ]): Rerunnable [A ] = fx.product(fy).map {
187+ case (x, y) => A .combine(x, y)
188188 }
189+ }
0 commit comments