Some deprecation patrol and minor cleanups.

5 files changed, 11 insertions, 16 deletions

diff --git a/src/actors/scala/actors/Reaction.scala b/src/actors/scala/actors/Reaction.scala
index 65584880f7..a8364bc8fb 100644
--- a/src/actors/scala/actors/Reaction.scala
+++ b/src/actors/scala/actors/Reaction.scala
@@ -25,7 +25,7 @@ private[actors] class KillActorException extends Throwable with ControlException
  *
  *  @author Philipp Haller
  */
-@deprecated
+@deprecated("This class will be removed in a future release")
 class Reaction(a: Actor, f: PartialFunction[Any, Any], msg: Any) extends ActorTask(a, () => {
   if (f == null)
     a.act()
diff --git a/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala b/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala
index 8f11d26b8a..bcc58ec448 100644
--- a/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala
+++ b/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala
@@ -111,9 +111,9 @@ class RefinedBuildManager(val settings: Settings) extends Changes with BuildMana
       (from.hasFlag(Flags.MODULE) == to.hasFlag(Flags.MODULE))
 
     // For testing purposes only, order irrelevant for compilation
-    def toStringSet(set: Set[AbstractFile]): String =  {
-        val s = (set.toList).sort(_.name < _.name)
-        s.mkString("Set(", ", ", ")")
+    def toStringSet(set: Set[AbstractFile]): String = {
+      val s = set.toList sortBy (_.name)
+      s.mkString("Set(", ", ", ")")
     }
 
     def update0(files: Set[AbstractFile]): Unit = if (!files.isEmpty) {
diff --git a/src/partest/scala/tools/partest/nest/DirectRunner.scala b/src/partest/scala/tools/partest/nest/DirectRunner.scala
index 0853a9a84b..3778a927df 100644
--- a/src/partest/scala/tools/partest/nest/DirectRunner.scala
+++ b/src/partest/scala/tools/partest/nest/DirectRunner.scala
@@ -57,13 +57,13 @@ trait DirectRunner {
     workers foreach { w =>
       receiveWithin(3600 * 1000) {
         case Results(res, logs, outdirs) =>
-          logsToDelete = logsToDelete ::: logs.filter(_.toDelete)
-          outdirsToDelete = outdirsToDelete ::: outdirs
-          results = results ++ res
+          logsToDelete :::= logs filter (_.toDelete)
+          outdirsToDelete :::= outdirs
+          results ++= res
         case TIMEOUT =>
           // add at least one failure
           NestUI.verbose("worker timed out; adding failed test")
-          results = results + ("worker timed out; adding failed test" -> 2)
+          results += ("worker timed out; adding failed test" -> 2)
       }
     }
     if (!isPartestDebug) {
diff --git a/src/partest/scala/tools/partest/nest/FileManager.scala b/src/partest/scala/tools/partest/nest/FileManager.scala
index df7a8e129c..ffeba6bbe3 100644
--- a/src/partest/scala/tools/partest/nest/FileManager.scala
+++ b/src/partest/scala/tools/partest/nest/FileManager.scala
@@ -12,16 +12,11 @@ import java.io.{File, FilenameFilter, IOException, StringWriter,
                 FileInputStream, FileOutputStream, BufferedReader,
                 FileReader, PrintWriter, FileWriter}
 import java.net.URI
-import scala.tools.nsc.io.Directory
+import scala.tools.nsc.io.{ Path, Directory }
 
 trait FileManager {
 
-  def basename(name: String): String = {
-    val inx = name.lastIndexOf(".")
-    if (inx < 0) name else name.substring(0, inx)
-  }
-
-  def deleteRecursive(dir: File) { Directory(dir).deleteRecursively() }
+  def basename(name: String): String = Path(name).stripExtension
 
   /**
    * Compares two files using a Java implementation of the GNU diff
diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala
index 9d990ef1ac..7a947b3298 100644
--- a/src/partest/scala/tools/partest/nest/Worker.scala
+++ b/src/partest/scala/tools/partest/nest/Worker.scala
@@ -973,7 +973,7 @@ class Worker(val fileManager: FileManager) extends Actor {
 
       try {
         // delete log file only if test was successful
-        if (good && !logFile.isEmpty)
+        if (good && !logFile.isEmpty && !isPartestDebug)
           logFile.get.toDelete = true
 
         writers match {