Skip to content

Commit 6b8be1f

Browse files
committed
Run formatter
1 parent e9fe9e6 commit 6b8be1f

File tree

10 files changed

+84
-72
lines changed

10 files changed

+84
-72
lines changed

benchmark/src/main/scala/io/catbird/benchmark/RerunnableBenchmark.scala

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@ class RerunnableBenchmark {
3939

4040
@Benchmark
4141
def sumIntsR: Int = Await.result(
42-
numbers.foldLeft(Rerunnable(0)) {
43-
case (acc, i) => acc.flatMap(prev => Rerunnable(prev + i))
44-
}.run
42+
numbers
43+
.foldLeft(Rerunnable(0)) {
44+
case (acc, i) => acc.flatMap(prev => Rerunnable(prev + i))
45+
}
46+
.run
4547
)
4648

4749
@Benchmark
@@ -53,8 +55,10 @@ class RerunnableBenchmark {
5355

5456
@Benchmark
5557
def sumIntsPR: Int = Await.result(
56-
numbers.foldLeft(Rerunnable.withFuturePool(pool)(0)) {
57-
case (acc, i) => acc.flatMap(prev => Rerunnable.withFuturePool(pool)(prev + i))
58-
}.run
58+
numbers
59+
.foldLeft(Rerunnable.withFuturePool(pool)(0)) {
60+
case (acc, i) => acc.flatMap(prev => Rerunnable.withFuturePool(pool)(prev + i))
61+
}
62+
.run
5963
)
6064
}

build.sbt

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ organization in ThisBuild := "io.catbird"
99

1010
val compilerOptions = Seq(
1111
"-deprecation",
12-
"-encoding", "UTF-8",
12+
"-encoding",
13+
"UTF-8",
1314
"-feature",
1415
"-language:existentials",
1516
"-language:higherKinds",
@@ -47,7 +48,8 @@ lazy val baseSettings = Seq(
4748

4849
lazy val allSettings = baseSettings ++ publishSettings
4950

50-
lazy val root = project.in(file("."))
51+
lazy val root = project
52+
.in(file("."))
5153
.enablePlugins(GhpagesPlugin, ScalaUnidocPlugin)
5254
.settings(allSettings ++ noPublishSettings)
5355
.settings(
@@ -122,13 +124,15 @@ lazy val publishSettings = Seq(
122124
licenses := Seq("Apache 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
123125
publishMavenStyle := true,
124126
publishArtifact in Test := false,
125-
pomIncludeRepository := { _ => false },
127+
pomIncludeRepository := { _ =>
128+
false
129+
},
126130
publishTo := {
127131
val nexus = "https://oss.sonatype.org/"
128132
if (isSnapshot.value)
129133
Some("snapshots" at nexus + "content/repositories/snapshots")
130134
else
131-
Some("releases" at nexus + "service/local/staging/deploy/maven2")
135+
Some("releases" at nexus + "service/local/staging/deploy/maven2")
132136
},
133137
autoAPIMappings := true,
134138
apiURL := Some(url("https://travisbrown.github.io/catbird/api/")),
@@ -159,10 +163,11 @@ credentials ++= (
159163
for {
160164
username <- Option(System.getenv().get("SONATYPE_USERNAME"))
161165
password <- Option(System.getenv().get("SONATYPE_PASSWORD"))
162-
} yield Credentials(
163-
"Sonatype Nexus Repository Manager",
164-
"oss.sonatype.org",
165-
username,
166-
password
167-
)
166+
} yield
167+
Credentials(
168+
"Sonatype Nexus Repository Manager",
169+
"oss.sonatype.org",
170+
username,
171+
password
172+
)
168173
).toSeq

effect/src/main/scala/io/catbird/util/effect/RerunnableInstances.scala

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,35 @@ trait RerunnableInstances {
1515
override final def delay[A](thunk: => A): Rerunnable[A] = Rerunnable[A](thunk)
1616

1717
final def async[A](k: (Either[Throwable, A] => Unit) => Unit): Rerunnable[A] =
18-
new Rerunnable[A] {
19-
final def run: Future[A] = {
20-
val promise = new Promise[A]
18+
new Rerunnable[A] {
19+
final def run: Future[A] = {
20+
val promise = new Promise[A]
2121

22-
k { e =>
23-
if (promise.isDefined) () else e match {
24-
case Right(a) => promise.setValue(a)
25-
case Left(err) => promise.setException(err)
22+
k { e =>
23+
if (promise.isDefined) ()
24+
else
25+
e match {
26+
case Right(a) => promise.setValue(a)
27+
case Left(err) => promise.setException(err)
28+
}
2629
}
27-
}
2830

29-
promise
31+
promise
32+
}
3033
}
31-
}
3234

3335
final def asyncF[A](k: (Either[Throwable, A] => Unit) => Rerunnable[Unit]): Rerunnable[A] =
3436
new Rerunnable[A] {
3537
final def run: Future[A] = {
3638
val promise = new Promise[A]
3739

3840
val rerunnable = k { e =>
39-
if (promise.isDefined) () else e match {
40-
case Right(a) => promise.setValue(a)
41-
case Left(err) => promise.setException(err)
42-
}
41+
if (promise.isDefined) ()
42+
else
43+
e match {
44+
case Right(a) => promise.setValue(a)
45+
case Left(err) => promise.setException(err)
46+
}
4347
}
4448

4549
rerunnable.run.flatMap(_ => promise)
@@ -56,7 +60,7 @@ trait RerunnableInstances {
5660
acquire.run.flatMap { a =>
5761
val future = use(a).run
5862
future.transform {
59-
case Return(b) => release(a, ExitCase.complete).run.flatMap(_ => future)
63+
case Return(b) => release(a, ExitCase.complete).run.flatMap(_ => future)
6064
case Throw(err) => release(a, ExitCase.error(err)).run.flatMap(_ => future)
6165
}
6266
}

effect/src/main/scala/io/catbird/util/effect/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import scala.util.{ Left, Right }
88
package object effect extends RerunnableInstances {
99
def futureToAsync[F[_], A](fa: => Future[A])(implicit F: Async[F]): F[A] = F.async { k =>
1010
fa.respond {
11-
case Return(a) => k(Right[Throwable, A](a))
11+
case Return(a) => k(Right[Throwable, A](a))
1212
case Throw(err) => k(Left[Throwable, A](err))
1313
}
1414
}

finagle/src/test/scala/io/catbird/finagle/service.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ import com.twitter.finagle.Service
99
import org.scalatest.FunSuite
1010
import org.typelevel.discipline.scalatest.Discipline
1111

12-
class ServiceSuite extends FunSuite with Discipline with
13-
ServiceInstances with ArbitraryInstances with EqInstances {
12+
class ServiceSuite extends FunSuite with Discipline with ServiceInstances with ArbitraryInstances with EqInstances {
1413
implicit val eq: Eq[Service[Int, Int]] = serviceEq(1.second)
1514

1615
checkAll("Service", CategoryTests[Service].compose[Int, Int, Int, Int])

util/src/main/scala/io/catbird/util/Rerunnable.scala

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -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+
}

util/src/main/scala/io/catbird/util/asyncstream.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ trait AsyncStreamInstances1 {
3636

3737
private[util] class AsyncStreamSemigroup[A](implicit A: Semigroup[A]) extends Semigroup[AsyncStream[A]] {
3838
final def combine(fa: AsyncStream[A], fb: AsyncStream[A]): AsyncStream[A] = fa.flatMap { a =>
39-
fb.map( b => A.combine(a,b) )
39+
fb.map(b => A.combine(a, b))
4040
}
4141

4242
}

util/src/main/scala/io/catbird/util/future.scala

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ trait FutureInstances extends FutureInstances1 {
2424
final def raiseError[A](e: Throwable): Future[A] = Future.exception(e)
2525

2626
final def tailRecM[A, B](a: A)(f: A => Future[Either[A, B]]): Future[B] = f(a).flatMap {
27-
case Right(b) => pure(b)
27+
case Right(b) => pure(b)
2828
case Left(nextA) => tailRecM(nextA)(f)
2929
}
3030
}
@@ -62,9 +62,8 @@ private[util] sealed abstract class FutureCoflatMap extends CoflatMap[Future] {
6262
final def coflatMap[A, B](fa: Future[A])(f: Future[A] => B): Future[B] = Future(f(fa))
6363
}
6464

65-
private[util] sealed class FutureSemigroup[A](implicit A: Semigroup[A])
66-
extends Semigroup[Future[A]] {
67-
final def combine(fx: Future[A], fy: Future[A]): Future[A] = fx.join(fy).map {
68-
case (x, y) => A.combine(x, y)
69-
}
65+
private[util] sealed class FutureSemigroup[A](implicit A: Semigroup[A]) extends Semigroup[Future[A]] {
66+
final def combine(fx: Future[A], fy: Future[A]): Future[A] = fx.join(fy).map {
67+
case (x, y) => A.combine(x, y)
7068
}
69+
}

util/src/main/scala/io/catbird/util/try.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ trait TryInstances extends TryInstances1 {
1111
implicit final def twitterTryEq[A](implicit A: Eq[A], T: Eq[Throwable]): Eq[Try[A]] =
1212
new Eq[Try[A]] {
1313
def eqv(x: Try[A], y: Try[A]): Boolean = (x, y) match {
14-
case (Throw(xError), Throw(yError)) => T.eqv(xError, yError)
14+
case (Throw(xError), Throw(yError)) => T.eqv(xError, yError)
1515
case (Return(xValue), Return(yValue)) => A.eqv(xValue, yValue)
16-
case _ => false
16+
case _ => false
1717
}
1818
}
1919

@@ -35,21 +35,21 @@ trait TryInstances extends TryInstances1 {
3535

3636
final def foldLeft[A, B](fa: Try[A], b: B)(f: (B, A) => B): B = fa match {
3737
case Return(a) => f(b, a)
38-
case Throw(_) => b
38+
case Throw(_) => b
3939
}
4040

4141
final def foldRight[A, B](fa: Try[A], lb: Eval[B])(f: (A, Eval[B]) => Eval[B]): Eval[B] = fa match {
4242
case Return(a) => f(a, lb)
43-
case Throw(_) => lb
43+
case Throw(_) => lb
4444
}
4545

4646
final def traverse[G[_], A, B](fa: Try[A])(f: A => G[B])(implicit G: Applicative[G]): G[Try[B]] = fa match {
47-
case Return(a) => G.map(f(a))(Return(_))
47+
case Return(a) => G.map(f(a))(Return(_))
4848
case t: Throw[_] => G.pure(TryInstances.castThrow[B](t))
4949
}
5050

5151
@tailrec final def tailRecM[A, B](a: A)(f: A => Try[Either[A, B]]): Try[B] = f(a) match {
52-
case t: Throw[_] => TryInstances.castThrow[B](t)
52+
case t: Throw[_] => TryInstances.castThrow[B](t)
5353
case Return(Left(a1)) => tailRecM(a1)(f)
5454
case Return(Right(b)) => Return(b)
5555
}

util/src/test/scala/io/catbird/util/asyncstream.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package util
44
import cats.Eq
55
import cats.instances.int._
66
import cats.instances.tuple._
7-
import cats.kernel.laws.discipline.{MonoidTests, SemigroupTests}
7+
import cats.kernel.laws.discipline.{ MonoidTests, SemigroupTests }
88
import cats.laws.discipline._
99
import com.twitter.concurrent.AsyncStream
1010
import com.twitter.conversions.DurationOps._
@@ -15,10 +15,10 @@ class AsyncStreamSuite extends FunSuite with Discipline with AsyncStreamInstance
1515

1616
implicit val eqAsyncStreamInt: Eq[AsyncStream[Int]] = asyncStreamEq(1.second)
1717
implicit val eqAsyncStreamAsyncStreamInt: Eq[AsyncStream[AsyncStream[Int]]] = asyncStreamEq(1.second)
18-
implicit val eqAsyncStreamIntIntInt: Eq[AsyncStream[(Int,Int,Int)]] = asyncStreamEq[(Int,Int,Int)](1.second)
18+
implicit val eqAsyncStreamIntIntInt: Eq[AsyncStream[(Int, Int, Int)]] = asyncStreamEq[(Int, Int, Int)](1.second)
1919

2020
checkAll("AsyncStream[Int]", MonadTests[AsyncStream].monad[Int, Int, Int])
2121
checkAll("AsyncStream[Int]", SemigroupTests[AsyncStream[Int]](asyncStreamSemigroup[Int]).semigroup)
2222
checkAll("AsyncStream[Int]", MonoidTests[AsyncStream[Int]].monoid)
23-
23+
2424
}

0 commit comments

Comments
 (0)