aboutsummaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
authorNicolas Stucki <nicolas.stucki@gmail.com>2016-12-14 16:34:44 +0100
committerNicolas Stucki <nicolas.stucki@gmail.com>2016-12-18 16:15:01 +0100
commit210a7582d5697f3300b39c38471a5bacc7c76230 (patch)
tree9844379c43896a3038bf045a0a3e4cff3fdf591e /compiler
parent0cf2cd7e551a71e5674dda572921e7cf5b17ced6 (diff)
downloaddotty-210a7582d5697f3300b39c38471a5bacc7c76230.tar.gz
dotty-210a7582d5697f3300b39c38471a5bacc7c76230.tar.bz2
dotty-210a7582d5697f3300b39c38471a5bacc7c76230.zip
Whitelist sources from scala/ref
Diffstat (limited to 'compiler')
-rw-r--r--compiler/test/dotc/scala-collections.blacklist8
-rw-r--r--compiler/test/dotc/scala-collections.whitelist6
2 files changed, 9 insertions, 5 deletions
diff --git a/compiler/test/dotc/scala-collections.blacklist b/compiler/test/dotc/scala-collections.blacklist
index c908aa241..c9cd0fcde 100644
--- a/compiler/test/dotc/scala-collections.blacklist
+++ b/compiler/test/dotc/scala-collections.blacklist
@@ -184,12 +184,10 @@
# | ^^^
# | not found: msg
-../scala-scala/src/library/scala/ref/PhantomReference.scala
-../scala-scala/src/library/scala/ref/Reference.scala
-../scala-scala/src/library/scala/ref/ReferenceQueue.scala
-../scala-scala/src/library/scala/ref/ReferenceWrapper.scala
-../scala-scala/src/library/scala/ref/SoftReference.scala
../scala-scala/src/library/scala/ref/WeakReference.scala
+# 33 | if (x != null) Some(x) else None
+# | ^^^^^^^^^^^
+# | Values of types wr.underlying.java$lang$ref$WeakReference$$T and Null cannot be compared with == or !=
../scala-scala/src/library/scala/reflect/ClassManifestDeprecatedApis.scala
../scala-scala/src/library/scala/reflect/ClassTag.scala
diff --git a/compiler/test/dotc/scala-collections.whitelist b/compiler/test/dotc/scala-collections.whitelist
index 0b878f108..89e632199 100644
--- a/compiler/test/dotc/scala-collections.whitelist
+++ b/compiler/test/dotc/scala-collections.whitelist
@@ -416,3 +416,9 @@
../scala-scala/src/library/scala/math/BigDecimal.scala
../scala-scala/src/library/scala/math/BigInt.scala
../scala-scala/src/library/scala/math/PartiallyOrdered.scala
+
+../scala-scala/src/library/scala/ref/PhantomReference.scala
+../scala-scala/src/library/scala/ref/Reference.scala
+../scala-scala/src/library/scala/ref/ReferenceQueue.scala
+../scala-scala/src/library/scala/ref/ReferenceWrapper.scala
+../scala-scala/src/library/scala/ref/SoftReference.scala