aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authoradamw <adam@warski.org>2017-08-04 13:15:10 +0200
committeradamw <adam@warski.org>2017-08-04 13:15:10 +0200
commit489e591672257d19b3a07198d4d6c9e21be601c7 (patch)
treee46ff3c29ad99898e2e5100cb43c8e13d637944a /core
parent69d7ee463848a620b80742a8c38c5798af909479 (diff)
downloadsttp-489e591672257d19b3a07198d4d6c9e21be601c7.tar.gz
sttp-489e591672257d19b3a07198d4d6c9e21be601c7.tar.bz2
sttp-489e591672257d19b3a07198d4d6c9e21be601c7.zip
Fixing 2.11
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/com/softwaremill/sttp/MonadError.scala7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/src/main/scala/com/softwaremill/sttp/MonadError.scala b/core/src/main/scala/com/softwaremill/sttp/MonadError.scala
index 40cea4b..604e964 100644
--- a/core/src/main/scala/com/softwaremill/sttp/MonadError.scala
+++ b/core/src/main/scala/com/softwaremill/sttp/MonadError.scala
@@ -2,7 +2,7 @@ package com.softwaremill.sttp
import scala.concurrent.{ExecutionContext, Future, Promise}
import scala.language.higherKinds
-import scala.util.Try
+import scala.util.{Failure, Success, Try}
trait MonadError[R[_]] {
def unit[T](t: T): R[T]
@@ -12,7 +12,10 @@ trait MonadError[R[_]] {
def flatten[T](ffa: R[R[T]]): R[T] = flatMap[R[T], T](ffa, identity)
- def fromTry[T](t: Try[T]): R[T] = t.fold(error, unit)
+ def fromTry[T](t: Try[T]): R[T] = t match {
+ case Success(v) => unit(v)
+ case Failure(e) => error(e)
+ }
}
trait MonadAsyncError[R[_]] extends MonadError[R] {