summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorViktor Klang <viktor.klang@gmail.com>2012-04-15 21:38:59 +0200
committerViktor Klang <viktor.klang@gmail.com>2012-04-15 21:38:59 +0200
commit48fbd60c3764724e58267054a5efae7717d4cb0d (patch)
tree1b86f876f000aaceb198ba9182273a7209e6bbee /src/library
parent611be28bb27ed0afd5da54f684d6b1aa7067ba87 (diff)
downloadscala-48fbd60c3764724e58267054a5efae7717d4cb0d.tar.gz
scala-48fbd60c3764724e58267054a5efae7717d4cb0d.tar.bz2
scala-48fbd60c3764724e58267054a5efae7717d4cb0d.zip
Removing the wrap-method from Promise
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/concurrent/Promise.scala7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/library/scala/concurrent/Promise.scala b/src/library/scala/concurrent/Promise.scala
index b3f1a1a0e0..f7ec0714cf 100644
--- a/src/library/scala/concurrent/Promise.scala
+++ b/src/library/scala/concurrent/Promise.scala
@@ -97,13 +97,6 @@ trait Promise[T] {
* @return If the promise has already been completed returns `false`, or `true` otherwise.
*/
def tryFailure(t: Throwable): Boolean = tryComplete(Left(t))
-
- /** Wraps a `Throwable` in an `ExecutionException` if necessary. TODO replace with `resolver` from scala.concurrent
- *
- * $allowedThrowables
- */
- protected def wrap(t: Throwable): Throwable =
- if (isFutureThrowable(t)) t else new ExecutionException(t)
}