summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
Diffstat (limited to 'test/files')
-rw-r--r--test/files/pos/collectGenericCC.scala8
-rw-r--r--test/files/pos/spec-funs.scala4
2 files changed, 6 insertions, 6 deletions
diff --git a/test/files/pos/collectGenericCC.scala b/test/files/pos/collectGenericCC.scala
index 099a53d3f5..5c51a50d71 100644
--- a/test/files/pos/collectGenericCC.scala
+++ b/test/files/pos/collectGenericCC.scala
@@ -1,10 +1,10 @@
-import scala.collection.generic._
+import scala.collection.generic.CanBuildFrom
import scala.collection._
object Test {
- def collect[A, Res](r: Traversable[A])(implicit bf: CanBuild[A, Res]) = {
- val b = bf()
- for (a <- r) b += a
+ def collect[A, Res](r: Traversable[A])(implicit bf: generic.CanBuild[A, Res]) = {
+ val b: collection.mutable.Builder[A, Res] = bf()
+ r foreach ((a: A) => b += a)
b.result
}
diff --git a/test/files/pos/spec-funs.scala b/test/files/pos/spec-funs.scala
index 5fea5e9560..d54dfd8227 100644
--- a/test/files/pos/spec-funs.scala
+++ b/test/files/pos/spec-funs.scala
@@ -54,10 +54,10 @@ final class ClosureTest {
}
}
-object TestInt extends testing.Benchmark {
+object TestInt extends scala.testing.Benchmark {
def run() = (new IntTest).run()
}
-object TestClosure extends testing.Benchmark {
+object TestClosure extends scala.testing.Benchmark {
def run() = (new ClosureTest).run()
}