summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2016-03-23 09:52:18 +0100
committerLukas Rytz <lukas.rytz@typesafe.com>2016-03-23 09:52:18 +0100
commit4ef14294453c43420e0e1a2ac984ba4a2d8b8dca (patch)
tree8b4aac09b51e6484fb3d6292838262d7d64fa7da /src
parent46595fb5fb4c548d52e39969aa58c69c30953bec (diff)
parentd832346268779090f08afad649a337ca571efc37 (diff)
downloadscala-4ef14294453c43420e0e1a2ac984ba4a2d8b8dca.tar.gz
scala-4ef14294453c43420e0e1a2ac984ba4a2d8b8dca.tar.bz2
scala-4ef14294453c43420e0e1a2ac984ba4a2d8b8dca.zip
Merge pull request #5056 from viktorklang/wip-SI9488-Future.toString-√
SI-9488 - adds the same default toString format to Scala Futures as 2…
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/concurrent/impl/Promise.scala4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/library/scala/concurrent/impl/Promise.scala b/src/library/scala/concurrent/impl/Promise.scala
index b15601058e..6d2fc5c87c 100644
--- a/src/library/scala/concurrent/impl/Promise.scala
+++ b/src/library/scala/concurrent/impl/Promise.scala
@@ -19,6 +19,10 @@ import java.util.concurrent.locks.AbstractQueuedSynchronizer
private[concurrent] trait Promise[T] extends scala.concurrent.Promise[T] with scala.concurrent.Future[T] {
def future: this.type = this
+ override def toString: String = value match {
+ case Some(result) => "Future("+result+")"
+ case None => "Future(<not completed>)"
+ }
}
/* Precondition: `executor` is prepared, i.e., `executor` has been returned from invocation of `prepare` on some other `ExecutionContext`.