summaryrefslogtreecommitdiff
path: root/src/partest
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2009-05-27 19:35:02 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2009-05-27 19:35:02 +0000
commitcc5e79c9ec9cea8d0f22020b528877d8f6e00153 (patch)
tree94e43f77c7b7271b3d0b6f9fb7372ae83b39360d /src/partest
parent4b8be5d8bec86358276407d6521c41702ccda835 (diff)
downloadscala-cc5e79c9ec9cea8d0f22020b528877d8f6e00153.tar.gz
scala-cc5e79c9ec9cea8d0f22020b528877d8f6e00153.tar.bz2
scala-cc5e79c9ec9cea8d0f22020b528877d8f6e00153.zip
In "Iterable" and in all its subclasses, "itera...
In "Iterable" and in all its subclasses, "iterator" replaces "elements" (and assorted changes).
Diffstat (limited to 'src/partest')
-rw-r--r--src/partest/scala/tools/partest/nest/CompileManager.scala2
-rw-r--r--src/partest/scala/tools/partest/nest/ConsoleRunner.scala4
-rw-r--r--src/partest/scala/tools/partest/nest/ReflectiveRunner.scala2
-rw-r--r--src/partest/scala/tools/partest/nest/Worker.scala2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/partest/scala/tools/partest/nest/CompileManager.scala b/src/partest/scala/tools/partest/nest/CompileManager.scala
index f7612823fc..0e48d58b8b 100644
--- a/src/partest/scala/tools/partest/nest/CompileManager.scala
+++ b/src/partest/scala/tools/partest/nest/CompileManager.scala
@@ -93,7 +93,7 @@ class DirectCompiler(val fileManager: FileManager) extends SimpleCompiler {
} else ""
val allOpts = fileManager.SCALAC_OPTS+" "+argString
NestUI.verbose("scalac options: "+allOpts)
- val args = List.fromArray(allOpts split "\\s")
+ val args = (allOpts split "\\s").toList
val command = new CompilerCommand(args, testSettings, x => {}, false)
val global = newGlobal(command.settings, logWriter)
val testRep: ExtConsoleReporter = global.reporter.asInstanceOf[ExtConsoleReporter]
diff --git a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala
index 1a2cfd6580..c353ea6f06 100644
--- a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala
+++ b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala
@@ -55,7 +55,7 @@ class ConsoleRunner extends DirectRunner with RunnerUtils {
def main(argstr: String) {
// tokenize args. filter: "".split("\\s") yields Array("")
- var args = List.fromArray(argstr split "\\s").remove(_ == "")
+ var args = (argstr split "\\s").toList.filterNot(_ == "")
if (args.length == 0)
NestUI.usage()
@@ -75,7 +75,7 @@ class ConsoleRunner extends DirectRunner with RunnerUtils {
else if (!classPath.isEmpty)
new ConsoleFileManager(classPath.get, true)
else if (args contains "--pack") {
- args = args.remove(_ == "--pack") // will create a result file '--pack' otherwise
+ args = args.filterNot(_ == "--pack") // will create a result file '--pack' otherwise
new ConsoleFileManager("build/pack")
} else // auto detection, see ConsoleFileManager.findLatest
new ConsoleFileManager
diff --git a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala
index 76e58efb74..2c5493f9e1 100644
--- a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala
+++ b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala
@@ -26,7 +26,7 @@ class ReflectiveRunner extends RunnerUtils {
val sepRunnerClassName = "scala.tools.partest.nest.ConsoleRunner"
def main(args: String) {
- val argList = List.fromArray(args.split("\\s"))
+ val argList = (args.split("\\s")).toList
// find out which build to test
val buildPath = searchPath("--buildpath", argList)
diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala
index 22fb6d606e..a01b9b0974 100644
--- a/src/partest/scala/tools/partest/nest/Worker.scala
+++ b/src/partest/scala/tools/partest/nest/Worker.scala
@@ -72,7 +72,7 @@ class Worker(val fileManager: FileManager) extends Actor {
file.getAbsolutePath.substring(filesPathLen)
}
}
- NestUI.normal("[...]"+name+List.toString(List.make(totalWidth-name.length, ' ')), printer)
+ NestUI.normal("[...]"+name+List.toString(List.fill(totalWidth-name.length)(' ')), printer)
}
def printInfoEnd(success: Boolean, printer: PrintWriter) {