diff options
author | Paul Phillips <paulp@improving.org> | 2009-11-20 20:37:12 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2009-11-20 20:37:12 +0000 |
commit | 937872a48956c11c278839622d5514a3ed65e25d (patch) | |
tree | 55f3b40281e9fa9236e2b922d961bc294cfff36d /src/library | |
parent | 06947d66eacd74a4c12aab2b3b3f3d4a8552ff88 (diff) | |
download | scala-937872a48956c11c278839622d5514a3ed65e25d.tar.gz scala-937872a48956c11c278839622d5514a3ed65e25d.tar.bz2 scala-937872a48956c11c278839622d5514a3ed65e25d.zip |
Expanding the warning cleansing into -unchecked...
Expanding the warning cleansing into -unchecked territory.
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/collection/SetLike.scala | 2 | ||||
-rw-r--r-- | src/library/scala/xml/include/sax/Main.scala | 14 |
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 { |