Deprecation patrol.

compile scalac with -deprecation and not cause any machines to catch
fire. Most of the remaining warnings are glancing furtively at Tuple2,
waiting for the moment to pounce.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
index 941b698b2a..f8d40a13f8 100644
--- a/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
+++ b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
@@ -50,12 +50,12 @@ abstract class AbstractReporter extends Reporter {
    *  @param pos ...
    *  @return    <code>true</code> if <code>pos</code> was already logged.
    */
-  private def testAndLog(pos: Position, severity: Severity): Boolean = {
-    if (pos eq null) return false
-    if (pos.offset.isEmpty) return false
-    val fpos = pos.focus
-    if ((positions contains fpos) && positions(fpos) >= severity) return true
-    positions += (fpos -> severity)
-    false
-  }
+  private def testAndLog(pos: Position, severity: Severity): Boolean =
+    pos != null && pos.isDefined && {
+      val fpos = pos.focus
+      (positions get fpos) match {
+        case Some(level) if level >= severity => true
+        case _                                => positions += (fpos -> severity) ; false
+      }
+    }
 }