summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-03-27 05:41:47 +0000
committerPaul Phillips <paulp@improving.org>2010-03-27 05:41:47 +0000
commit0c8e2195960d47e5b9be93efb7c95802ae40dca6 (patch)
tree4546dbdde688402560032002b62fbea9d84b1343 /src/compiler
parentec127ce60de679809a75c3c85f25ec4256b9dd13 (diff)
downloadscala-0c8e2195960d47e5b9be93efb7c95802ae40dca6.tar.gz
scala-0c8e2195960d47e5b9be93efb7c95802ae40dca6.tar.bz2
scala-0c8e2195960d47e5b9be93efb7c95802ae40dca6.zip
TraversableOnce. Review by odersky.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/io/Directory.scala1
-rw-r--r--src/compiler/scala/tools/nsc/io/File.scala1
-rw-r--r--src/compiler/scala/tools/nsc/io/ZipArchive.scala1
-rw-r--r--src/compiler/scala/tools/nsc/matching/Matrix.scala2
4 files changed, 1 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/io/Directory.scala b/src/compiler/scala/tools/nsc/io/Directory.scala
index 2c7f5e1059..5355fcf681 100644
--- a/src/compiler/scala/tools/nsc/io/Directory.scala
+++ b/src/compiler/scala/tools/nsc/io/Directory.scala
@@ -10,7 +10,6 @@ package scala.tools.nsc
package io
import java.io.{ File => JFile }
-import collection.Traversable
object Directory {
import scala.util.Properties.{ tmpDir, userHome, userDir }
diff --git a/src/compiler/scala/tools/nsc/io/File.scala b/src/compiler/scala/tools/nsc/io/File.scala
index 67d39fd742..7f2c736408 100644
--- a/src/compiler/scala/tools/nsc/io/File.scala
+++ b/src/compiler/scala/tools/nsc/io/File.scala
@@ -15,7 +15,6 @@ import java.io.{
FileInputStream, FileOutputStream, BufferedReader, BufferedWriter, InputStreamReader, OutputStreamWriter,
BufferedInputStream, BufferedOutputStream, IOException, PrintStream, File => JFile }
import java.nio.channels.{ Channel, FileChannel }
-import collection.Traversable
import scala.io.Codec
object File
diff --git a/src/compiler/scala/tools/nsc/io/ZipArchive.scala b/src/compiler/scala/tools/nsc/io/ZipArchive.scala
index 9d062a45f1..f4af0f5a8f 100644
--- a/src/compiler/scala/tools/nsc/io/ZipArchive.scala
+++ b/src/compiler/scala/tools/nsc/io/ZipArchive.scala
@@ -14,7 +14,6 @@ import java.io.{ File => JFile, IOException, InputStream, BufferedInputStream, B
import java.util.zip.{ ZipEntry, ZipFile, ZipInputStream }
import PartialFunction._
-import scala.collection.Traversable
import scala.collection.mutable.{ Map, HashMap }
import scala.collection.JavaConversions.asIterator
diff --git a/src/compiler/scala/tools/nsc/matching/Matrix.scala b/src/compiler/scala/tools/nsc/matching/Matrix.scala
index 88507efa2f..de3204318f 100644
--- a/src/compiler/scala/tools/nsc/matching/Matrix.scala
+++ b/src/compiler/scala/tools/nsc/matching/Matrix.scala
@@ -49,7 +49,7 @@ trait Matrix extends MatrixAdditions {
The is the real work-horse of the algorithm. There is some column whose top-most pattern is a
constructor. (Forsimplicity, itisdepicted above asthe left-most column, but anycolumn will do.)
The goal is to build a test state with the variablevand some outgoing arcs (one for each construc-
- tor and possibly a default arc). Foreach constructorcin the selected column, its arc is defined as
+ tor and possibly a default arc). Foreach constructor in the selected column, its arc is defined as
follows:
Let {i1,...,ij} be the rows-indices of the patterns in the column that match c. Since the pat-