summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-07-27 02:45:00 -0700
committerPaul Phillips <paulp@improving.org>2012-07-27 05:42:17 -0700
commit61d1933e29e1730a981edf738c902a39c7d322de (patch)
tree5eb493e812687d05af8628b0ba6c3fe7c1d460cd /src/library
parent785c4ddedd68914f7b5667d0e9733e3fddebe1a0 (diff)
downloadscala-61d1933e29e1730a981edf738c902a39c7d322de.tar.gz
scala-61d1933e29e1730a981edf738c902a39c7d322de.tar.bz2
scala-61d1933e29e1730a981edf738c902a39c7d322de.zip
Eliminated remainder of "catches Throwable" warnings.
And also non-exhaustive matches. And added -nowarn to the build options for scalacheck, we don't need to hear the warnings for code we aren't able to fix.
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/util/Try.scala2
-rw-r--r--src/library/scala/xml/dtd/ElementValidator.scala1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/library/scala/util/Try.scala b/src/library/scala/util/Try.scala
index 9475a05d5a..de8c366acd 100644
--- a/src/library/scala/util/Try.scala
+++ b/src/library/scala/util/Try.scala
@@ -208,7 +208,7 @@ final case class Success[+T](value: T) extends Try[T] {
def flatMap[U](f: T => Try[U]): Try[U] =
try f(value)
catch {
- case e => Failure(e)
+ case e: Throwable => Failure(e)
}
def flatten[U](implicit ev: T <:< Try[U]): Try[U] = value
def foreach[U](f: T => U): Unit = f(value)
diff --git a/src/library/scala/xml/dtd/ElementValidator.scala b/src/library/scala/xml/dtd/ElementValidator.scala
index 111c1b5e78..f97da1c8a3 100644
--- a/src/library/scala/xml/dtd/ElementValidator.scala
+++ b/src/library/scala/xml/dtd/ElementValidator.scala
@@ -115,6 +115,7 @@ class ElementValidator() extends Function1[Node,Boolean] {
(dfa delta q).getOrElse(e, throw ValidationException("element %s not allowed here" format e))
}
}
+ case _ => false
}
/** applies various validations - accumulates error messages in exc