diff options
author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-09-10 08:58:56 -0700 |
---|---|---|
committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-09-10 08:58:56 -0700 |
commit | 19e783b655576ecf2a32d2d0704657ba14940c8a (patch) | |
tree | aaf8e8986f802120bc2b93e416589ec981afdea4 /src | |
parent | a8b0188987f41ca4f11540b4a5b61faae2407ba0 (diff) | |
parent | c4834f6e8c5bdf036ec2271a5bcf62ad7f8a8795 (diff) | |
download | scala-19e783b655576ecf2a32d2d0704657ba14940c8a.tar.gz scala-19e783b655576ecf2a32d2d0704657ba14940c8a.tar.bz2 scala-19e783b655576ecf2a32d2d0704657ba14940c8a.zip |
Merge pull request #1278 from soc/remove-scalaruntime-try
SI-6345 Remove scala.runtime.ScalaRunTime.Try
Diffstat (limited to 'src')
-rw-r--r-- | src/library/scala/runtime/ScalaRunTime.scala | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/library/scala/runtime/ScalaRunTime.scala b/src/library/scala/runtime/ScalaRunTime.scala index e5f5e9dc5d..a8635151ff 100644 --- a/src/library/scala/runtime/ScalaRunTime.scala +++ b/src/library/scala/runtime/ScalaRunTime.scala @@ -167,35 +167,6 @@ object ScalaRunTime { def checkInitialized[T <: AnyRef](x: T): T = if (x == null) throw new UninitializedError else x - abstract class Try[+A] { - def Catch[B >: A](handler: PartialFunction[Throwable, B]): B - def Finally(fin: => Unit): A - } - - def Try[A](block: => A): Try[A] = new Try[A] with Runnable { - private var result: A = _ - private var exception: Throwable = - try { run() ; null } - catch { - case e: ControlThrowable => throw e // don't catch non-local returns etc - case e: Throwable => e - } - - def run() { result = block } - - def Catch[B >: A](handler: PartialFunction[Throwable, B]): B = - if (exception == null) result - else if (handler isDefinedAt exception) handler(exception) - else throw exception - - def Finally(fin: => Unit): A = { - fin - - if (exception == null) result - else throw exception - } - } - def _toString(x: Product): String = x.productIterator.mkString(x.productPrefix + "(", ",", ")") |