diff options
| author | Heather Miller <heather.miller@epfl.ch> | 2012-07-05 16:49:40 +0200 |
|---|---|---|
| committer | Heather Miller <heather.miller@epfl.ch> | 2012-07-05 16:49:40 +0200 |
| commit | d2fd2922e71dddb2c22c1a5b0cf36614cd78e1b4 (patch) | |
| tree | cd32e94c9dba1e1990ac8d738a7e2b958e7c0142 /src/library/scala/concurrent/Future.scala | |
| parent | 171a1d8bc859947d80d4728c251abe330dbe9802 (diff) | |
| download | scala-d2fd2922e71dddb2c22c1a5b0cf36614cd78e1b4.tar.gz scala-d2fd2922e71dddb2c22c1a5b0cf36614cd78e1b4.tar.bz2 scala-d2fd2922e71dddb2c22c1a5b0cf36614cd78e1b4.zip | |
SI-5981, SI-5979, SI-5973 Closed. Maintenance to Try.
Diffstat (limited to 'src/library/scala/concurrent/Future.scala')
| -rw-r--r-- | src/library/scala/concurrent/Future.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/library/scala/concurrent/Future.scala b/src/library/scala/concurrent/Future.scala index 2a52d0ac0b..2de0c57253 100644 --- a/src/library/scala/concurrent/Future.scala +++ b/src/library/scala/concurrent/Future.scala @@ -18,8 +18,9 @@ import java.{ lang => jl } import java.util.concurrent.atomic.{ AtomicReferenceFieldUpdater, AtomicInteger, AtomicBoolean } import scala.concurrent.util.Duration -import scala.concurrent.impl.NonFatal +import scala.util.control.NonFatal import scala.Option +import scala.util.{Try, Success, Failure} import scala.annotation.tailrec import scala.collection.mutable.Stack |