built new starr and fixed test cases

10 files changed, 18 insertions, 17 deletions

diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1
index 1afefb0069..81320552fb 100644
--- a/lib/scala-compiler.jar.desired.sha1
+++ b/lib/scala-compiler.jar.desired.sha1
@@ -1 +1 @@
-25ca20b2d26a533d50a7c9bf8c10ddcdc43a0320 ?scala-compiler.jar
+d06411d536210b51f108754f02d64c7fa0320a09 ?scala-compiler.jar
diff --git a/lib/scala-library-src.jar.desired.sha1 b/lib/scala-library-src.jar.desired.sha1
index 1eb230897d..c4e07b2277 100644
--- a/lib/scala-library-src.jar.desired.sha1
+++ b/lib/scala-library-src.jar.desired.sha1
@@ -1 +1 @@
-3610a5e08a2811468685e542743eb5f281c1ed66 ?scala-library-src.jar
+5920af564b81d7d7e92d6c3731daa2fbb056b473 ?scala-library-src.jar
diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1
index d499702f08..6c2e6a6b5b 100644
--- a/lib/scala-library.jar.desired.sha1
+++ b/lib/scala-library.jar.desired.sha1
@@ -1 +1 @@
-5b25bbba4324bafa998a5f6e6f4cc51c494e0d2a ?scala-library.jar
+c23e211e9723f1fb619304927ecf043d96ed1c94 ?scala-library.jar
diff --git a/test/files/pos/collectGenericCC.scala b/test/files/pos/collectGenericCC.scala
index 099a53d3f5..3d993dabd0 100644
--- a/test/files/pos/collectGenericCC.scala
+++ b/test/files/pos/collectGenericCC.scala
@@ -8,7 +8,7 @@ object Test {
     b.result
   }
 
-  collect[Int, Vector[Int]](List(1,2,3,4))
+  collect[Int, IndexedSeq[Int]](List(1,2,3,4))
   collect[Char, String](List('1','2','3','4'))
   collect[Char, Array[Char]](List('1','2','3','4'))
 }
\ No newline at end of file
diff --git a/test/files/pos/signatures/Test.java b/test/files/pos/signatures/Test.java
index a50ccb9d01..3d1e3756a7 100644
--- a/test/files/pos/signatures/Test.java
+++ b/test/files/pos/signatures/Test.java
@@ -1,4 +1,4 @@
-import scala.collection.mutable.Vector;
+import scala.collection.mutable.IndexedSeq;
 import test.Outer;
 
 /* Test correct generation of java signatures. The Outer class should not
diff --git a/test/files/pos/spec-List.scala b/test/files/pos/spec-List.scala
index b746eca44b..2a1d11b8d5 100644
--- a/test/files/pos/spec-List.scala
+++ b/test/files/pos/spec-List.scala
@@ -29,7 +29,7 @@ sealed abstract class List[@specialized +A] extends LinearSeq[A]
                                   with LinearSeqLike[A, List[A]] {
   override def companion: GenericCompanion[List] = List
 
-  import scala.collection.{Iterable, Traversable, Seq, Vector}
+  import scala.collection.{Iterable, Traversable, Seq, IndexedSeq}
 
   /** Returns true if the list does not contain any elements.
    *  @return <code>true</code>, iff the list is empty.
@@ -494,7 +494,7 @@ final case class ::[@specialized B](private var hd: B, private[scala] var tl: Li
  */
 object List extends SeqFactory[List] {
 
-  import collection.{Iterable, Seq, Vector}
+  import collection.{Iterable, Seq, IndexedSeq}
 
   implicit def builderFactory[A]: CanBuildFrom[Coll, A, List[A]] =
     new GenericCanBuildFrom[A] {
diff --git a/test/files/run/colltest1.scala b/test/files/run/colltest1.scala
index efdce00277..1ce73396f0 100644
--- a/test/files/run/colltest1.scala
+++ b/test/files/run/colltest1.scala
@@ -215,7 +215,7 @@ object Test extends Application {
   sequenceTest(LinearSeq())
 //  sequenceTest(mutable.LinearSeq())
   sequenceTest(immutable.LinearSeq())
-  sequenceTest(mutable.Vector())
+  sequenceTest(mutable.IndexedSeq())
   rangeTest(1 to 10)
 
   setTest(Set())
diff --git a/test/files/run/sequenceComparisons.scala b/test/files/run/sequenceComparisons.scala
index 3ce08fb2e1..30192096db 100644
--- a/test/files/run/sequenceComparisons.scala
+++ b/test/files/run/sequenceComparisons.scala
@@ -24,7 +24,7 @@ object Test {
     mutable.Seq(_: _*),
     // immutable.Stack(_: _*),
     // mutable.Stack(_: _*),
-    immutable.Vector(_: _*),
+    immutable.IndexedSeq(_: _*), // was Vector
     //mutable.Vector(_: _*),
     immutable.List(_: _*),
     immutable.Stream(_: _*)
diff --git a/test/files/run/t2074_2.check b/test/files/run/t2074_2.check
index 416b327bd0..eb1f072de3 100644
--- a/test/files/run/t2074_2.check
+++ b/test/files/run/t2074_2.check
@@ -1,3 +1,3 @@
-VectorView(1, 2, 3)
-VectorView(1, 2, 3)
-VectorViewZ((1,1), (2,2), (3,3))
+IndexedSeqView(1, 2, 3)
+IndexedSeqView(1, 2, 3)
+IndexedSeqViewZ((1,1), (2,2), (3,3))
diff --git a/test/files/run/t2074_2.scala b/test/files/run/t2074_2.scala
index 24fa6c7601..7d1d8181d8 100644
--- a/test/files/run/t2074_2.scala
+++ b/test/files/run/t2074_2.scala
@@ -1,13 +1,14 @@
-import scala.collection.immutable.Vector
-import scala.collection.VectorView
+// replaced all occurrences of 'Vector' with 'IndexedSeq'
+import scala.collection.immutable.IndexedSeq
+import scala.collection.IndexedSeqView
 
 object Test {
-  val v = new VectorView[Int, Vector[Int]] {
-    def underlying = Vector(1,2,3)
+  val v = new IndexedSeqView[Int, IndexedSeq[Int]] {
+    def underlying = IndexedSeq(1,2,3)
     def apply(idx: Int) = underlying(idx)
     def length = underlying.length
   }
-  val w = Vector(1, 2, 3).view
+  val w = IndexedSeq(1, 2, 3).view
 
   def main(args: Array[String]): Unit = {
     println(v)