summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorJosh Suereth <Joshua.Suereth@gmail.com>2012-06-22 07:03:21 -0700
committerJosh Suereth <Joshua.Suereth@gmail.com>2012-06-22 07:03:21 -0700
commite0761b4dcbbc3bcbebc6392faa91bf239d247ca0 (patch)
tree28a8285a54ab06249e78950795e167f94e8e3db0 /src/library
parent04e2f86d6b2daf4b53671516659986faca4f82d7 (diff)
parentf84659b46ee25cdc4b63e6d59f5015fc5314a63d (diff)
downloadscala-e0761b4dcbbc3bcbebc6392faa91bf239d247ca0.tar.gz
scala-e0761b4dcbbc3bcbebc6392faa91bf239d247ca0.tar.bz2
scala-e0761b4dcbbc3bcbebc6392faa91bf239d247ca0.zip
Merge pull request #756 from axel22/issue/4809
Fix SI-4809.
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/util/control/Breaks.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/library/scala/util/control/Breaks.scala b/src/library/scala/util/control/Breaks.scala
index d7f5a57f50..accda5b8f7 100644
--- a/src/library/scala/util/control/Breaks.scala
+++ b/src/library/scala/util/control/Breaks.scala
@@ -41,8 +41,8 @@ class Breaks {
}
}
- trait TryBlock {
- def catchBreak(onBreak: => Unit): Unit
+ sealed trait TryBlock[T] {
+ def catchBreak(onBreak: =>T): T
}
/**
@@ -57,8 +57,8 @@ class Breaks {
* }
* }}}
*/
- def tryBreakable(op: => Unit) = new TryBlock {
- def catchBreak(onBreak: => Unit) = try {
+ def tryBreakable[T](op: =>T) = new TryBlock[T] {
+ def catchBreak(onBreak: =>T) = try {
op
} catch {
case ex: BreakControl =>