aboutsummaryrefslogtreecommitdiff
path: root/compiler/test/dotc
diff options
context:
space:
mode:
authorNicolas Stucki <nicolas.stucki@gmail.com>2016-12-14 14:40:54 +0100
committerNicolas Stucki <nicolas.stucki@gmail.com>2016-12-18 16:15:01 +0100
commit60bf04cab4e2797021e0b94faa72a0347415364a (patch)
tree50e965e8c09d2d3faf1d5732bc1f022af5fcd0f7 /compiler/test/dotc
parent6d3ba74de666ac051b6d8f2b88043fe83f28b904 (diff)
downloaddotty-60bf04cab4e2797021e0b94faa72a0347415364a.tar.gz
dotty-60bf04cab4e2797021e0b94faa72a0347415364a.tar.bz2
dotty-60bf04cab4e2797021e0b94faa72a0347415364a.zip
Whitelist sources from scala/collection/convert
Diffstat (limited to 'compiler/test/dotc')
-rw-r--r--compiler/test/dotc/scala-collections.blacklist11
-rw-r--r--compiler/test/dotc/scala-collections.whitelist8
2 files changed, 13 insertions, 6 deletions
diff --git a/compiler/test/dotc/scala-collections.blacklist b/compiler/test/dotc/scala-collections.blacklist
index 517c4c340..024f52698 100644
--- a/compiler/test/dotc/scala-collections.blacklist
+++ b/compiler/test/dotc/scala-collections.blacklist
@@ -39,13 +39,12 @@
../scala-scala/src/library/scala/collection/concurrent/Map.scala
../scala-scala/src/library/scala/collection/concurrent/TrieMap.scala
-../scala-scala/src/library/scala/collection/convert/DecorateAsJava.scala
-../scala-scala/src/library/scala/collection/convert/DecorateAsScala.scala
-../scala-scala/src/library/scala/collection/convert/Decorators.scala
-../scala-scala/src/library/scala/collection/convert/package.scala
-../scala-scala/src/library/scala/collection/convert/WrapAsJava.scala
-../scala-scala/src/library/scala/collection/convert/WrapAsScala.scala
+
../scala-scala/src/library/scala/collection/convert/Wrappers.scala
+# 34 | def remove() = throw new UnsupportedOperationException
+# | ^
+# | overriding method remove in trait Iterator of type ()Unit;
+# | method remove of type ()Unit needs `override' modifier
../scala-scala/src/library/scala/collection/generic/ParSetFactory.scala
diff --git a/compiler/test/dotc/scala-collections.whitelist b/compiler/test/dotc/scala-collections.whitelist
index 3fa1a56f9..1b69b6a20 100644
--- a/compiler/test/dotc/scala-collections.whitelist
+++ b/compiler/test/dotc/scala-collections.whitelist
@@ -363,3 +363,11 @@
../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/convert/DecorateAsJava.scala
+../scala-scala/src/library/scala/collection/convert/DecorateAsScala.scala
+../scala-scala/src/library/scala/collection/convert/Decorators.scala
+../scala-scala/src/library/scala/collection/convert/package.scala
+../scala-scala/src/library/scala/collection/convert/WrapAsJava.scala
+../scala-scala/src/library/scala/collection/convert/WrapAsScala.scala
+