fix some tests

tests/pos/javaReadsSigs/fromjava.java still imported old collections

doc-tool/test/dotty/tools/dottydoc/WhitelistedStdLib.scala and GenCollections depended on the removed scala 2 library

Author: bishabosha

doc-tool/test/dotty/tools/dottydoc/GenDocs.scala

@@ -28,15 +28,6 @@ trait LocalResources extends DocDriver {
     files
 }
 
-object GenCollections extends LocalResources {
-  import Files._
-
-  val collections = TestWhitelistedCollections.files
-
-  override def main(args: Array[String]): Unit =
-    super.main(withClasspath(collections.toArray))
-}
-
 object GenDottyDocs extends LocalResources {
   import Files._
 

doc-tool/test/dotty/tools/dottydoc/WhitelistedStdLib.scala

@@ -2,16 +2,17 @@
 import scala.math.Ordering;
 import scala.math.Numeric;
 import scala.collection.Seq;
-import scala.collection.Traversable;
-import scala.collection.Traversable$;
+import scala.collection.Iterable;
+import scala.collection.Iterable$;
 import scala.collection.immutable.Set;
 import scala.collection.immutable.HashSet;
 import scala.collection.immutable.Map;
 import scala.collection.immutable.Map$;
 import scala.collection.immutable.HashMap;
 import scala.collection.immutable.Vector;
 import scala.collection.immutable.List;
-import scala.collection.generic.CanBuildFrom;
+import scala.collection.LinearSeq;
+import scala.collection.BuildFrom;
 
 class A { };
 class B { };
@@ -48,28 +49,28 @@ public static String vector(Vector<String> x) {
     return y.head();
   }
   public static String list(List<String> x) {
-    List<String> y = x.drop(2);
+    LinearSeq<String> y = x.drop(2);
     return y.head();
   }
   public static Tuple2<String, Integer> map(Map<String, Integer> x) {
-    Traversable<Tuple2<String, Integer>> y = x.drop(2);
+    Iterable<Tuple2<String, Integer>> y = x.drop(2);
     return y.head();
   }
-  public static <T> Object sum(Traversable<T> x) {
+  public static <T> Object sum(Iterable<T> x) {
     return x.sum(Contra.intNum);
   }
   // Looks like sum as given below fails under java5, so disabled.
   //
   // [partest] testing: [...]/files/pos/javaReadsSigs                                [FAILED]
-  // [partest] files/pos/javaReadsSigs/fromjava.java:62: name clash: sum(scala.collection.Traversable<A>) and <T>sum(scala.collection.Traversable<T>) have the same erasure
-  // [partest]   public static B sum(Traversable<A> x) {
+  // [partest] files/pos/javaReadsSigs/fromjava.java:62: name clash: sum(scala.collection.Iterable<A>) and <T>sum(scala.collection.Iterable<T>) have the same erasure
+  // [partest]   public static B sum(Iterable<A> x) {
   // [partest]                   ^
   //
   //
-  // can't make this work with an actual CanBuildFrom: see #4389.
-  // public static B sum(Traversable<A> x) {
-  //   // have to cast it unfortunately: map in TraversableLike returns
+  // can't make this work with an actual BuildFrom: see #4389.
+  // public static B sum(Iterable<A> x) {
+  //   // have to cast it unfortunately: map in IterableLike returns
   //   // "That" and such types seem to be signature poison.
-  //   return ((Traversable<B>)x.map(f1, null)).head();
+  //   return ((Iterable<B>)x.map(f1, null)).head();
   // }
 }