diff options
author | Simon Ochsenreither <simon@ochsenreither.de> | 2015-10-25 23:20:04 +0100 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-12-18 10:31:49 +0100 |
commit | 92affd3e76d1a3019f1c35ac20af32360d914641 (patch) | |
tree | 296270bf7271c1085a94d71e2d4bfa5789b3bfca /src/library/scala/util/Try.scala | |
parent | 1873db3fb78ba777c009bce11564466de875257a (diff) | |
download | scala-92affd3e76d1a3019f1c35ac20af32360d914641.tar.gz scala-92affd3e76d1a3019f1c35ac20af32360d914641.tar.bz2 scala-92affd3e76d1a3019f1c35ac20af32360d914641.zip |
Remove unused imports and other minor cleanups
- Language imports are preceding other imports
- Deleted empty file: InlineErasure
- Removed some unused private[parallel] methods in
scala/collection/parallel/package.scala
This removes hundreds of warnings when compiling with
"-Xlint -Ywarn-dead-code -Ywarn-unused -Ywarn-unused-import".
Diffstat (limited to 'src/library/scala/util/Try.scala')
-rw-r--r-- | src/library/scala/util/Try.scala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/library/scala/util/Try.scala b/src/library/scala/util/Try.scala index b1b9965614..84d170249d 100644 --- a/src/library/scala/util/Try.scala +++ b/src/library/scala/util/Try.scala @@ -9,7 +9,6 @@ package scala package util -import scala.collection.Seq import scala.util.control.NonFatal import scala.language.implicitConversions @@ -218,12 +217,12 @@ final case class Failure[+T](exception: Throwable) extends Try[T] { override def isSuccess: Boolean = false override def get: T = throw exception override def getOrElse[U >: T](default: => U): U = default - override def orElse[U >: T](default: => Try[U]): Try[U] = + override def orElse[U >: T](default: => Try[U]): Try[U] = try default catch { case NonFatal(e) => Failure(e) } override def flatMap[U](f: T => Try[U]): Try[U] = this.asInstanceOf[Try[U]] override def flatten[U](implicit ev: T <:< Try[U]): Try[U] = this.asInstanceOf[Try[U]] override def foreach[U](f: T => U): Unit = () - override def transform[U](s: T => Try[U], f: Throwable => Try[U]): Try[U] = + override def transform[U](s: T => Try[U], f: Throwable => Try[U]): Try[U] = try f(exception) catch { case NonFatal(e) => Failure(e) } override def map[U](f: T => U): Try[U] = this.asInstanceOf[Try[U]] override def collect[U](pf: PartialFunction[T, U]): Try[U] = this.asInstanceOf[Try[U]] |