diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala | 7 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/Worker.scala | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala b/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala index 52135ebcd6..7c977c6e60 100644 --- a/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala +++ b/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala @@ -111,11 +111,8 @@ 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 sortBy (_.name) map - (_.toString.replaceAll(java.util.regex.Matcher.quoteReplacement("\\"), "/")) - s.mkString("Set(", ", ", ")") - } + def toStringSet(set: Set[AbstractFile]): String = + set.toList sortBy (_.name) mkString("Set(", ", ", ")") def update0(files: Set[AbstractFile]): Unit = if (!files.isEmpty) { deleteClassfiles(files) diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index 45fa5e2020..7797c1095a 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -614,8 +614,8 @@ class Worker(val fileManager: FileManager) extends Actor { loop() testReader.close() } - val unixsrcpath = sourcepath.replaceAll(java.util.regex.Matcher.quoteReplacement("\\"), "/") - fileManager.mapFile(logFile, "tmp", file, _.replace(unixsrcpath, "")) + fileManager.mapFile(logFile, "tmp", file, _.replace(sourcepath, ""). + replaceAll(java.util.regex.Matcher.quoteReplacement("\\"), "/")) diffCheck(compareOutput(file, fileBase, kind, logFile)) } |