More fun with -Xmigration.

to BufferLike (++ and similar now create a new collection.)

Removed MapLikeBase.  Annotated all the methods in mutable.{ Map, Set }
which mutated in-place in 2.7 to note that they create new
collections, and implemented same.

At this point the only +/- like method which mutates in place which I am
aware of is BufferLike.+ (see source comment for my observations.)

Also tweaked some collections return types as necessitated by these
changes, such as mutable.Set.clone() now returning "This" rather than
mutable.Set[A].

References #3089, closes #3179. Review by odersky.

3 files changed, 15 insertions, 15 deletions

diff --git a/test/files/run/arybufgrow.scala b/test/files/run/arybufgrow.scala
index 4dccd962f2..35b3233055 100644
--- a/test/files/run/arybufgrow.scala
+++ b/test/files/run/arybufgrow.scala
@@ -3,7 +3,7 @@ import scala.collection.mutable._;
 object Test extends Application {
   val buf = new ArrayBuffer[String];
   for(val i <- List.range(0,1000)) {
-    buf + "hello";
+    buf += "hello";
   }
 
   Console.println("1000 = " + buf.length);
diff --git a/test/files/run/colltest1.check b/test/files/run/colltest1.check
index 7dcf4bd1a6..a5f4ada7a3 100644
--- a/test/files/run/colltest1.check
+++ b/test/files/run/colltest1.check
@@ -95,15 +95,15 @@ ArrayBuffer(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
 true
 false
 true
-Map(E -> E, X -> X, N -> N, T -> T, Y -> Y, J -> J, U -> U, F -> F, A -> A, M -> M, I -> I, G -> G, V -> V, Q -> Q, L -> L, B -> B, P -> P, C -> C, H -> H, W -> W, K -> K, R -> R, O -> O, D -> D, Z -> Z, S -> S)
-Map(E -> E, X -> X, N -> N, T -> T, Y -> Y, J -> J, U -> U, F -> F, A -> A, M -> M, I -> I, G -> G, V -> V, Q -> Q, L -> L, B -> B, P -> P, C -> C, H -> H, W -> W, K -> K, R -> R, O -> O, D -> D, Z -> Z, S -> S)
-Map(O -> O, W -> W, H -> H, P -> P, V -> V, G -> G, I -> I, A -> A, F -> F, U -> U, N -> N, X -> X, Z -> Z, S -> S, D -> D, K -> K, R -> R, C -> C, B -> B, L -> L, Q -> Q, M -> M, J -> J, Y -> Y, T -> T, E -> E)
-Map(O -> O, W -> W, H -> H, P -> P, V -> V, G -> G, I -> I, A -> A, F -> F, U -> U, N -> N, X -> X, Z -> Z, S -> S, D -> D, K -> K, R -> R, C -> C, B -> B, L -> L, Q -> Q, M -> M, J -> J, Y -> Y, T -> T, E -> E)
-Map(E -> E, X -> X, N -> N, T -> T, Y -> Y, J -> J, U -> U, F -> F, A -> A, M -> M, I -> I, G -> G, V -> V, Q -> Q, L -> L, B -> B, P -> P, C -> C, H -> H, W -> W, K -> K, R -> R, O -> O, D -> D, Z -> Z, S -> S)
-Map(E -> E, X -> X, N -> N, T -> T, Y -> Y, J -> J, U -> U, F -> F, A -> A, M -> M, I -> I, G -> G, V -> V, Q -> Q, L -> L, B -> B, P -> P, C -> C, H -> H, W -> W, K -> K, R -> R, O -> O, D -> D, Z -> Z, S -> S)
-Map(A -> A, B -> B, C -> C, D -> D, E -> E, F -> F, G -> G, H -> H, I -> I, J -> J, K -> K, L -> L, M -> M, N -> N, O -> O, P -> P, Q -> Q, R -> R, S -> S, T -> T, U -> U, V -> V, W -> W, X -> X, Y -> Y, Z -> Z)
-Map(A -> A, B -> B, C -> C, D -> D, E -> E, F -> F, G -> G, H -> H, I -> I, J -> J, K -> K, L -> L, M -> M, N -> N, O -> O, P -> P, Q -> Q, R -> R, S -> S, T -> T, U -> U, V -> V, W -> W, X -> X, Y -> Y, Z -> Z)
-Map(O -> O, W -> W, H -> H, P -> P, V -> V, G -> G, I -> I, A -> A, F -> F, U -> U, N -> N, X -> X, Z -> Z, S -> S, D -> D, K -> K, R -> R, C -> C, B -> B, L -> L, Q -> Q, M -> M, J -> J, Y -> Y, T -> T, E -> E)
-Map(O -> O, W -> W, H -> H, P -> P, V -> V, G -> G, I -> I, A -> A, F -> F, U -> U, N -> N, X -> X, Z -> Z, S -> S, D -> D, K -> K, R -> R, C -> C, B -> B, L -> L, Q -> Q, M -> M, J -> J, Y -> Y, T -> T, E -> E)
-Map(E -> E, X -> X, N -> N, T -> T, Y -> Y, J -> J, U -> U, F -> F, A -> A, M -> M, I -> I, G -> G, V -> V, Q -> Q, L -> L, B -> B, P -> P, C -> C, H -> H, W -> W, K -> K, R -> R, O -> O, D -> D, Z -> Z, S -> S)
-Map(E -> E, X -> X, N -> N, T -> T, Y -> Y, J -> J, U -> U, F -> F, A -> A, M -> M, I -> I, G -> G, V -> V, Q -> Q, L -> L, B -> B, P -> P, C -> C, H -> H, W -> W, K -> K, R -> R, O -> O, D -> D, Z -> Z, S -> S)
+List((A,A), (B,B), (C,C), (D,D), (E,E), (F,F), (G,G), (H,H), (I,I), (J,J), (K,K), (L,L), (M,M), (N,N), (O,O), (P,P), (Q,Q), (R,R), (S,S), (T,T), (U,U), (V,V), (W,W), (X,X), (Y,Y), (Z,Z))
+List((A,A), (B,B), (C,C), (D,D), (E,E), (F,F), (G,G), (H,H), (I,I), (J,J), (K,K), (L,L), (M,M), (N,N), (O,O), (P,P), (Q,Q), (R,R), (S,S), (T,T), (U,U), (V,V), (W,W), (X,X), (Y,Y), (Z,Z))
+List((A,A), (B,B), (C,C), (D,D), (E,E), (F,F), (G,G), (H,H), (I,I), (J,J), (K,K), (L,L), (M,M), (N,N), (O,O), (P,P), (Q,Q), (R,R), (S,S), (T,T), (U,U), (V,V), (W,W), (X,X), (Y,Y), (Z,Z))
+List((A,A), (B,B), (C,C), (D,D), (E,E), (F,F), (G,G), (H,H), (I,I), (J,J), (K,K), (L,L), (M,M), (N,N), (O,O), (P,P), (Q,Q), (R,R), (S,S), (T,T), (U,U), (V,V), (W,W), (X,X), (Y,Y), (Z,Z))
+List((A,A), (B,B), (C,C), (D,D), (E,E), (F,F), (G,G), (H,H), (I,I), (J,J), (K,K), (L,L), (M,M), (N,N), (O,O), (P,P), (Q,Q), (R,R), (S,S), (T,T), (U,U), (V,V), (W,W), (X,X), (Y,Y), (Z,Z))
+List((A,A), (B,B), (C,C), (D,D), (E,E), (F,F), (G,G), (H,H), (I,I), (J,J), (K,K), (L,L), (M,M), (N,N), (O,O), (P,P), (Q,Q), (R,R), (S,S), (T,T), (U,U), (V,V), (W,W), (X,X), (Y,Y), (Z,Z))
+List((A,A), (B,B), (C,C), (D,D), (E,E), (F,F), (G,G), (H,H), (I,I), (J,J), (K,K), (L,L), (M,M), (N,N), (O,O), (P,P), (Q,Q), (R,R), (S,S), (T,T), (U,U), (V,V), (W,W), (X,X), (Y,Y), (Z,Z))
+List((A,A), (B,B), (C,C), (D,D), (E,E), (F,F), (G,G), (H,H), (I,I), (J,J), (K,K), (L,L), (M,M), (N,N), (O,O), (P,P), (Q,Q), (R,R), (S,S), (T,T), (U,U), (V,V), (W,W), (X,X), (Y,Y), (Z,Z))
+List((A,A), (B,B), (C,C), (D,D), (E,E), (F,F), (G,G), (H,H), (I,I), (J,J), (K,K), (L,L), (M,M), (N,N), (O,O), (P,P), (Q,Q), (R,R), (S,S), (T,T), (U,U), (V,V), (W,W), (X,X), (Y,Y), (Z,Z))
+List((A,A), (B,B), (C,C), (D,D), (E,E), (F,F), (G,G), (H,H), (I,I), (J,J), (K,K), (L,L), (M,M), (N,N), (O,O), (P,P), (Q,Q), (R,R), (S,S), (T,T), (U,U), (V,V), (W,W), (X,X), (Y,Y), (Z,Z))
+List((A,A), (B,B), (C,C), (D,D), (E,E), (F,F), (G,G), (H,H), (I,I), (J,J), (K,K), (L,L), (M,M), (N,N), (O,O), (P,P), (Q,Q), (R,R), (S,S), (T,T), (U,U), (V,V), (W,W), (X,X), (Y,Y), (Z,Z))
+List((A,A), (B,B), (C,C), (D,D), (E,E), (F,F), (G,G), (H,H), (I,I), (J,J), (K,K), (L,L), (M,M), (N,N), (O,O), (P,P), (Q,Q), (R,R), (S,S), (T,T), (U,U), (V,V), (W,W), (X,X), (Y,Y), (Z,Z))
diff --git a/test/files/run/colltest1.scala b/test/files/run/colltest1.scala
index 47b273f8ee..557282cb8d 100644
--- a/test/files/run/colltest1.scala
+++ b/test/files/run/colltest1.scala
@@ -170,7 +170,7 @@ object Test extends Application {
     m += (("D" -> "D"), ("E" -> "E"), ("F" -> "F"))
     m ++= List(("G" -> "G"), ("H" -> "H"), ("I" -> "I"))
     m ++= ('J' to 'Z') map (x => (x.toString -> x.toString))
-    println(m)
+    println(m.toList.sorted)
     assert(!m.isEmpty)
     assert(m.keySet forall (k => (m get k) == Some(k)))
     assert(m.keySet forall (k => (m apply k) == k))
@@ -185,7 +185,7 @@ object Test extends Application {
     assert(mm.isEmpty, mm)
     def m3 = empty ++ m1
     assert(m1 == m3)
-    println(m3)
+    println(m3.toList.sorted)
     val m4 = m3 filterNot { case (k, v) => k != "A" }
     assert(m4.size == 1, m4)
   }