From 61d1933e29e1730a981edf738c902a39c7d322de Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Fri, 27 Jul 2012 02:45:00 -0700
Subject: 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.
---
 src/library/scala/util/Try.scala                 | 2 +-
 src/library/scala/xml/dtd/ElementValidator.scala | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/library')

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
-- 
cgit v1.2.3