Expanding the warning cleansing into -unchecked...

Expanding the warning cleansing into -unchecked territory.

2 files changed, 9 insertions, 7 deletions

diff --git a/src/library/scala/collection/SetLike.scala b/src/library/scala/collection/SetLike.scala
index 0752f4185f..401c272516 100644
--- a/src/library/scala/collection/SetLike.scala
+++ b/src/library/scala/collection/SetLike.scala
@@ -176,7 +176,7 @@ self =>
    *              contain the same elements.
    */
   override def equals(that: Any): Boolean = that match {
-    case that: Set[A] =>
+    case that: Set[_] =>
       (this eq that) ||
       (that canEqual this) &&
       (this.size == that.size) &&
diff --git a/src/library/scala/xml/include/sax/Main.scala b/src/library/scala/xml/include/sax/Main.scala
index 4df95d1046..405fc670e5 100644
--- a/src/library/scala/xml/include/sax/Main.scala
+++ b/src/library/scala/xml/include/sax/Main.scala
@@ -47,13 +47,15 @@ object Main {
     if (args.isEmpty)
       return
 
-    val (resolver, args2): (Option[EntityResolver], Array[String]) =
-      if (args.size < 2 || args(0) != "-r") (None, args)
+    def dashR = args.size >= 2 && args(0) == "-r"
+    val args2 = if (dashR) args drop 2 else args
+    val resolver: Option[EntityResolver] =
+      if (dashR) None
       else catching(classOf[Exception]) opt {
-        val r = Class.forName(args(1)).newInstance().asInstanceOf[EntityResolver]
-        parser setEntityResolver r
-        (r, args drop 2)
-      } orElse (return error("Could not load requested EntityResolver"))
+          val r = Class.forName(args(1)).newInstance().asInstanceOf[EntityResolver]
+          parser setEntityResolver r
+          r
+        } orElse (return error("Could not load requested EntityResolver"))
 
     for (arg <- args2) {
       try {