Update scala-collections lists

2 files changed, 23 insertions, 9 deletions

diff --git a/compiler/test/dotc/scala-collections.blacklist b/compiler/test/dotc/scala-collections.blacklist
index 03a665e4e..476d37c17 100644
--- a/compiler/test/dotc/scala-collections.blacklist
+++ b/compiler/test/dotc/scala-collections.blacklist
@@ -8,37 +8,39 @@
 
 ../scala-scala/src/library/scala/collection/generic/ParSetFactory.scala
 
-../scala-scala/src/library/scala/collection/mutable/DefaultEntry.scala
+#../scala-scala/src/library/scala/collection/mutable/DefaultEntry.scala
 # 22 |    "(kv: " + key + ", " + value + ")" + (if (next != null) " -> " + next.toString else "")
 #    |                                                                     ^^^^
 #    |                                                                     cyclic reference involving method toString
+# (Fixed by adding type annotation to DefaultEntry)
 
-../scala-scala/src/library/scala/collection/mutable/LinkedHashMap.scala
+#../scala-scala/src/library/scala/collection/mutable/LinkedHashMap.scala
 #  102 |  protected class FilteredKeys(p: A => Boolean) extends super.FilteredKeys(p) {
 #      |                                                        ^^^^^^^^^^^^^^^^^^^^
 #      |                                                        cyclic inheritance: class FilteredKeys extends itself
 # ...
+# (Fixed by rewriring inner class names in LinkedHashMap)
 
-../scala-scala/src/library/scala/collection/mutable/ObservableMap.scala
+#../scala-scala/src/library/scala/collection/mutable/ObservableMap.scala
 #  assertion failed
 
-../scala-scala/src/library/scala/collection/mutable/ObservableSet.scala
+#../scala-scala/src/library/scala/collection/mutable/ObservableSet.scala
 # 35 |      publish(new Include(elem) with Undoable { def undo = -=(elem) })
 #    |                                                    ^
 #    |                         overriding method undo in trait Undoable of type ()Unit;
 #    |                          method undo of type => scala.collection.mutable.ObservableSet[A] has incompatible type
 
-../scala-scala/src/library/scala/collection/mutable/SynchronizedQueue.scala
+#../scala-scala/src/library/scala/collection/mutable/SynchronizedQueue.scala
 # 102 |  override def toString() = synchronized { super.toString() }
 #      |                                           ^^^^^^^^^^^^^^^^
 #      |                                        missing argument for parameter index of method apply: (index: Int)Char
 
-../scala-scala/src/library/scala/collection/mutable/UnrolledBuffer.scala
+#../scala-scala/src/library/scala/collection/mutable/UnrolledBuffer.scala
 # 347 |    override def toString = array.take(size).mkString("Unrolled[" + array.length + "](", ", ", ")") + " -> " + (if (next ne null) next.toString else "")
 #     |                                                                                                                                  ^^^^
 #     |                                                                    cyclic reference involving method toString
 
-../scala-scala/src/library/scala/collection/mutable/SynchronizedBuffer.scala
+#../scala-scala/src/library/scala/collection/mutable/SynchronizedBuffer.scala
 # assertion failed
 
 ../scala-scala/src/library/scala/collection/parallel/mutable/ParArray.scala
@@ -100,12 +102,12 @@
 #    |    ^^^^^^^^^^^
 #    |    value `body` is not a member of ForkJoinTasks.this.WrappedTask[R, Tp](fjtask)
 
-../scala-scala/src/library/scala/concurrent/Future.scala
+#../scala-scala/src/library/scala/concurrent/Future.scala
 # 188 |    implicit val ec = internalExecutor
 #     |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 #     |    type of implicit definition needs to be given explicitly
 
-../scala-scala/src/library/scala/concurrent/SyncChannel.scala
+#../scala-scala/src/library/scala/concurrent/SyncChannel.scala
 # 45 |    writeReq.get
 #    |    ^^^^^^^^^^^^
 #    |    none of the overloaded alternatives of method get in class SyncVar with types
diff --git a/compiler/test/dotc/scala-collections.whitelist b/compiler/test/dotc/scala-collections.whitelist
index 9b2cfa74e..4230af7d1 100644
--- a/compiler/test/dotc/scala-collections.whitelist
+++ b/compiler/test/dotc/scala-collections.whitelist
@@ -87,6 +87,13 @@
 
 ../scala-scala/src/library/scala/collection/mutable/ArrayBuilder.scala
 ../scala-scala/src/library/scala/collection/mutable/ObservableBuffer.scala
+../scala-scala/src/library/scala/collection/mutable/DefaultEntry.scala
+../scala-scala/src/library/scala/collection/mutable/LinkedHashMap.scala
+../scala-scala/src/library/scala/collection/mutable/ObservableMap.scala
+../scala-scala/src/library/scala/collection/mutable/ObservableSet.scala
+../scala-scala/src/library/scala/collection/mutable/SynchronizedQueue.scala
+../scala-scala/src/library/scala/collection/mutable/UnrolledBuffer.scala
+../scala-scala/src/library/scala/collection/mutable/SynchronizedBuffer.scala
 
 ../scala-scala/src/library/scala/collection/immutable/Stack.scala
 ../scala-scala/src/library/scala/collection/immutable/StringLike.scala
@@ -364,6 +371,7 @@
 ../scala-scala/src/library/scala/collection/mutable/TreeSet.scala
 ../scala-scala/src/library/scala/collection/mutable/Undoable.scala
 ../scala-scala/src/library/scala/collection/mutable/WeakHashMap.scala
+../scala-scala/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
 
 ../scala-scala/src/library/scala/collection/convert/DecorateAsJava.scala
 ../scala-scala/src/library/scala/collection/convert/DecorateAsScala.scala
@@ -437,6 +445,8 @@
 ../scala-scala/src/library/scala/collection/script/Message.scala
 ../scala-scala/src/library/scala/collection/script/Scriptable.scala
 
+#../scala-scala/src/library/scala/concurrent/package.scala
+../scala-scala/src/library/scala/concurrent/Future.scala
 ../scala-scala/src/library/scala/concurrent/Awaitable.scala
 ../scala-scala/src/library/scala/concurrent/BatchingExecutor.scala
 ../scala-scala/src/library/scala/concurrent/BlockContext.scala
@@ -457,6 +467,8 @@
 ../scala-scala/src/library/scala/concurrent/SyncVar.scala
 ../scala-scala/src/library/scala/concurrent/TaskRunner.scala
 ../scala-scala/src/library/scala/concurrent/ThreadPoolRunner.scala
+../scala-scala/src/library/scala/concurrent/SyncChannel.scala
+#../scala-scala/src/library/scala/concurrent/impl/ExecutionContextImpl.scala
 
 ../scala-scala/src/library/scala/collection/parallel/Combiner.scala
 ../scala-scala/src/library/scala/collection/parallel/mutable/LazyCombiner.scala