summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorViktor Klang <viktor.klang@gmail.com>2016-03-22 10:31:32 +0100
committerViktor Klang <viktor.klang@gmail.com>2016-03-22 13:37:34 +0100
commitd832346268779090f08afad649a337ca571efc37 (patch)
treee2310e55ad59e658256b96a04c7d9f7e77ffbaa7 /src/library
parentafb14588edeb199ad5b6b2deedb55abe3c998503 (diff)
downloadscala-d832346268779090f08afad649a337ca571efc37.tar.gz
scala-d832346268779090f08afad649a337ca571efc37.tar.bz2
scala-d832346268779090f08afad649a337ca571efc37.zip
SI-9488 - adds the same default toString format to Scala Futures as 2.12.x
Includes tests to verify the toString representations.
Diffstat (limited to 'src/library')
-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`.