Skip to content

Commit e5eebd4

Browse files
committed
formatting
1 parent f99e91b commit e5eebd4

File tree

6 files changed

+44
-19
lines changed

6 files changed

+44
-19
lines changed

benchmark/src/main/scala/io/github/ragazoor/IOBenchmark.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class IOBenchmark {
4343
await(futureFlatMapRec(recursion, StdFuture.successful(1)))
4444

4545
@tailrec private[this] final def resultFlatMapRec(i: Int, f: Attempt[Nothing, Int])(implicit
46-
ec: ExecutionContext
46+
ec: ExecutionContext
4747
): Attempt[Nothing, Int] =
4848
if (i > 0) resultFlatMapRec(i - 1, f.flatMap(Attempt.successful)(ec))(ec)
4949
else f
@@ -61,7 +61,7 @@ class IOBenchmark {
6161
await(futureMapRec(recursion, StdFuture.successful(1)))
6262

6363
@tailrec private[this] final def resultMapRec(i: Int, f: Attempt[Nothing, Int])(implicit
64-
ec: ExecutionContext
64+
ec: ExecutionContext
6565
): Attempt[Nothing, Int] =
6666
if (i > 0) resultMapRec(i - 1, f.map(identity)(ec))(ec)
6767
else f
@@ -76,7 +76,7 @@ class IOBenchmark {
7676
else f
7777

7878
@tailrec private[this] final def resultMapErrorRec(i: Int, f: Attempt[RuntimeException, Int])(implicit
79-
ec: ExecutionContext
79+
ec: ExecutionContext
8080
): Attempt[RuntimeException, Int] =
8181
if (i > 0) resultMapErrorRec(i - 1, f.mapError(identity)(ec))(ec)
8282
else f

result/src/main/scala/io/github/ragazoor/Attempt.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package io.github.ragazoor
22

3-
import io.github.ragazoor.AttemptUtils.{failedFailure, zipWithTuple2Fun}
3+
import io.github.ragazoor.AttemptUtils.{ failedFailure, zipWithTuple2Fun }
44

55
import scala.concurrent.ExecutionContext.parasitic
66
import scala.concurrent.duration.Duration
7-
import scala.concurrent.{Awaitable, CanAwait, ExecutionContext, TimeoutException, Future => StdFuture}
7+
import scala.concurrent.{ Awaitable, CanAwait, ExecutionContext, Future => StdFuture, TimeoutException }
88
import scala.util.control.NonFatal
9-
import scala.util.{Failure, Success, Try}
9+
import scala.util.{ Failure, Success, Try }
1010

1111
sealed trait Attempt[+E <: Throwable, +A] extends Awaitable[A] {
1212
self =>
@@ -46,12 +46,12 @@ sealed trait Attempt[+E <: Throwable, +A] extends Awaitable[A] {
4646
zipWith(that)(zipWithTuple2Fun)(parasitic)
4747

4848
def zipWith[E2 >: E <: Throwable, U, R](that: Attempt[E2, U])(f: (A, U) => R)(implicit
49-
ec: ExecutionContext
49+
ec: ExecutionContext
5050
): Attempt[E2, R] =
5151
Attempt(self.toFuture.zipWith(that.toFuture)(f), isFatal || that.isFatal)
5252

5353
def catchAll[E2 >: E <: Throwable, A2 >: A](f: E => Attempt[E2, A2])(implicit
54-
ec: ExecutionContext
54+
ec: ExecutionContext
5555
): Attempt[E2, A2] = {
5656
var isFutureFatal = isFatal
5757
val transformedFuture = self.toFuture.transformWith {
@@ -65,7 +65,7 @@ sealed trait Attempt[+E <: Throwable, +A] extends Awaitable[A] {
6565
}
6666

6767
def catchSome[E2 >: E <: Throwable, A2 >: A](pf: PartialFunction[E, Attempt[E2, A2]])(implicit
68-
ec: ExecutionContext
68+
ec: ExecutionContext
6969
): Attempt[E2, A2] = {
7070
val transformedFuture = self.toFuture.transformWith {
7171
case Failure(e) if NonFatal(e) && pf.isDefinedAt(e.asInstanceOf[E]) && !isFatal =>
@@ -98,7 +98,7 @@ sealed trait Attempt[+E <: Throwable, +A] extends Awaitable[A] {
9898
Attempt(self.toFuture.transform(f), isFatal)
9999

100100
def transformWith[E2 >: E <: Throwable, B](f: Try[A] => Attempt[E2, B])(implicit
101-
executor: ExecutionContext
101+
executor: ExecutionContext
102102
): Attempt[E2, B] =
103103
Attempt(self.toFuture.transformWith(f(_).toFuture), isFatal)
104104

@@ -166,7 +166,7 @@ object Attempt {
166166
}
167167

168168
final def sequence[E <: Throwable, A](results: Seq[Attempt[E, A]])(implicit
169-
ec: ExecutionContext
169+
ec: ExecutionContext
170170
): Attempt[E, Seq[A]] =
171171
Attempt(StdFuture.sequence(results.map(_.toFuture)), fatal = false)
172172

result/src/main/scala/io/github/ragazoor/Future.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.ragazoor
22

3-
import scala.concurrent.{ExecutionContext, Future => StdFuture}
3+
import scala.concurrent.{ ExecutionContext, Future => StdFuture }
44
import scala.util.Try
55

66
/*

result/src/main/scala/io/github/ragazoor/migration/IoToStdFuture.scala

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package io.github.ragazoor.migration
22

33
import io.github.ragazoor.Attempt
44

5-
import scala.concurrent.{Future => StdFuture}
5+
import scala.concurrent.{ Future => StdFuture }
66
import scala.language.implicitConversions
77

88
trait IoToStdFuture {
@@ -244,7 +244,29 @@ trait IoToStdFuture {
244244
X21,
245245
B
246246
](
247-
f21: (X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15, X16, X17, X18, X19, X20, X21) => Attempt[E, B]
247+
f21: (
248+
X1,
249+
X2,
250+
X3,
251+
X4,
252+
X5,
253+
X6,
254+
X7,
255+
X8,
256+
X9,
257+
X10,
258+
X11,
259+
X12,
260+
X13,
261+
X14,
262+
X15,
263+
X16,
264+
X17,
265+
X18,
266+
X19,
267+
X20,
268+
X21
269+
) => Attempt[E, B]
248270
): (X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15, X16, X17, X18, X19, X20, X21) => StdFuture[B] =
249271
(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15, x16, x17, x18, x19, x20, x21) =>
250272
f21(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15, x16, x17, x18, x19, x20, x21).toFuture

result/src/main/scala/io/github/ragazoor/migration/implicits.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package io.github.ragazoor.migration
22

33
import io.github.ragazoor.Attempt
44

5-
import scala.concurrent.{Future => StdFuture}
5+
import scala.concurrent.{ Future => StdFuture }
66
import scala.language.implicitConversions
77

88
object implicits extends IoToStdFuture {

result/src/test/scala/io/github/ragazoor/AttemptSpec.scala

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package io.github.ragazoor
22

33
import munit.FunSuite
44

5-
import scala.concurrent.{Future => StdFuture}
5+
import scala.concurrent.{ Future => StdFuture }
66
import scala.util.Try
77

88
class AttemptSpec extends FunSuite {
@@ -170,13 +170,15 @@ class AttemptSpec extends FunSuite {
170170
}
171171

172172
test("Future.mapEither") {
173-
Attempt.successful(1)
173+
Attempt
174+
.successful(1)
174175
.mapEither(_ => Right(2))
175176
.map(result => assert(result == 2))
176177
}
177178

178179
test("Future.mapEither, with typed error") {
179-
Attempt.successful(1)
180+
Attempt
181+
.successful(1)
180182
.mapEither[RuntimeException, Int](_ => Left(new RuntimeException("Test message")))
181183
.map(_ => assert(false))
182184
.catchSome { case _: RuntimeException =>
@@ -185,7 +187,8 @@ class AttemptSpec extends FunSuite {
185187
}
186188

187189
test("Future.mapTry") {
188-
Attempt.successful(1)
190+
Attempt
191+
.successful(1)
189192
.mapTry(_ => Try(2))
190193
.map(result => assert(result == 2))
191194
}

0 commit comments

Comments
 (0)