Skip to content

Commit 9acc4ef

Browse files
committed
Whitelist ObservableMap
1 parent 696b943 commit 9acc4ef

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

compiler/test/dotc/scala-collections.blacklist

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,14 @@
3030
# | cyclic inheritance: class FilteredKeys extends itself
3131
# ...
3232

33-
../scala-scala/src/library/scala/collection/mutable/ObservableBuffer.scala
34-
# 73 | })
35-
# | ^
36-
# | found: scala.collection.script.Reset with scala.collection.mutable.Undoable{...}
37-
# | required: scala.collection.script.Message[A] & scala.collection.mutable.Undoable
38-
# ...
39-
4033
../scala-scala/src/library/scala/collection/mutable/ObservableMap.scala
41-
# 68 | })
42-
# | ^
43-
# | found: scala.collection.script.Reset with scala.collection.mutable.Undoable{...}
44-
# | required: scala.collection.script.Message[(A, B)] & scala.collection.mutable.Undoable
34+
# assertion failed
4535

4636
../scala-scala/src/library/scala/collection/mutable/ObservableSet.scala
47-
# 52 | })
48-
# | ^
49-
# | found: scala.collection.script.Reset with scala.collection.mutable.Undoable{...}
50-
# | required: scala.collection.script.Message[A] & scala.collection.mutable.Undoable
37+
# 35 | publish(new Include(elem) with Undoable { def undo = -=(elem) })
38+
# | ^
39+
# | overriding method undo in trait Undoable of type ()Unit;
40+
# | method undo of type => scala.collection.mutable.ObservableSet[A] has incompatible type
5141

5242
../scala-scala/src/library/scala/collection/mutable/SynchronizedQueue.scala
5343
# 102 | override def toString() = synchronized { super.toString() }

compiler/test/dotc/scala-collections.whitelist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
../scala-scala/src/library/scala/collection/mutable/BufferLike.scala
8787

8888
../scala-scala/src/library/scala/collection/mutable/ArrayBuilder.scala
89+
../scala-scala/src/library/scala/collection/mutable/ObservableBuffer.scala
8990

9091
../scala-scala/src/library/scala/collection/immutable/Stack.scala
9192
../scala-scala/src/library/scala/collection/immutable/StringLike.scala

0 commit comments

Comments
 (0)