diff options
Diffstat (limited to 'compiler')
-rw-r--r-- | compiler/test/dotc/scala-collections.blacklist | 20 | ||||
-rw-r--r-- | compiler/test/dotc/scala-collections.whitelist | 1 |
2 files changed, 6 insertions, 15 deletions
diff --git a/compiler/test/dotc/scala-collections.blacklist b/compiler/test/dotc/scala-collections.blacklist index 2085228b2..b8353c079 100644 --- a/compiler/test/dotc/scala-collections.blacklist +++ b/compiler/test/dotc/scala-collections.blacklist @@ -30,24 +30,14 @@ # | cyclic inheritance: class FilteredKeys extends itself # ... -../scala-scala/src/library/scala/collection/mutable/ObservableBuffer.scala -# 73 | }) -# | ^ -# | found: scala.collection.script.Reset with scala.collection.mutable.Undoable{...} -# | required: scala.collection.script.Message[A] & scala.collection.mutable.Undoable -# ... - ../scala-scala/src/library/scala/collection/mutable/ObservableMap.scala -# 68 | }) -# | ^ -# | found: scala.collection.script.Reset with scala.collection.mutable.Undoable{...} -# | required: scala.collection.script.Message[(A, B)] & scala.collection.mutable.Undoable +# assertion failed ../scala-scala/src/library/scala/collection/mutable/ObservableSet.scala -# 52 | }) -# | ^ -# | found: scala.collection.script.Reset with scala.collection.mutable.Undoable{...} -# | required: scala.collection.script.Message[A] & scala.collection.mutable.Undoable +# 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 # 102 | override def toString() = synchronized { super.toString() } diff --git a/compiler/test/dotc/scala-collections.whitelist b/compiler/test/dotc/scala-collections.whitelist index 51c2990a2..5e00fdb15 100644 --- a/compiler/test/dotc/scala-collections.whitelist +++ b/compiler/test/dotc/scala-collections.whitelist @@ -86,6 +86,7 @@ ../scala-scala/src/library/scala/collection/mutable/BufferLike.scala ../scala-scala/src/library/scala/collection/mutable/ArrayBuilder.scala +../scala-scala/src/library/scala/collection/mutable/ObservableBuffer.scala ../scala-scala/src/library/scala/collection/immutable/Stack.scala ../scala-scala/src/library/scala/collection/immutable/StringLike.scala |