aboutsummaryrefslogtreecommitdiff
path: root/compiler/test/dotc
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2016-12-21 09:25:21 +0100
committerMartin Odersky <odersky@gmail.com>2016-12-21 09:25:21 +0100
commitcf4f773840ba3955b2907b04208b378d22d37651 (patch)
tree121ae2551e7131b023eb18a4e5e70950e07cefd3 /compiler/test/dotc
parent190ee9dce3851d752c5dbe1f10bd96d2c2d6642b (diff)
downloaddotty-cf4f773840ba3955b2907b04208b378d22d37651.tar.gz
dotty-cf4f773840ba3955b2907b04208b378d22d37651.tar.bz2
dotty-cf4f773840ba3955b2907b04208b378d22d37651.zip
Fiddling with widenening
Fixing two failures in stdlib having to do with widening. In both cases, a widenIfUnstable was required. One was widening too much, the other too little.
Diffstat (limited to 'compiler/test/dotc')
-rw-r--r--compiler/test/dotc/scala-collections.blacklist8
-rw-r--r--compiler/test/dotc/scala-collections.whitelist4
2 files changed, 4 insertions, 8 deletions
diff --git a/compiler/test/dotc/scala-collections.blacklist b/compiler/test/dotc/scala-collections.blacklist
index 3decba994..342317825 100644
--- a/compiler/test/dotc/scala-collections.blacklist
+++ b/compiler/test/dotc/scala-collections.blacklist
@@ -25,7 +25,7 @@
-## Ycheck failures
+## Ycheck failures, presumably linked to TailCalls
../scala-scala/src/library/scala/collection/parallel/ParIterableLike.scala
# -Ycheck:classOf fails
@@ -34,13 +34,9 @@
# -Ycheck:classOf fails
../scala-scala/src/library/scala/util/control/TailCalls.scala
-# -Ycheck:classOf failure
+# -Ycheck:classOf fails
-../scala-scala/src/library/scala/concurrent/impl/ExecutionContextImpl.scala
-# -Ycheck:arrayConstructors failure
-../scala-scala/src/library/scala/concurrent/package.scala
-# -Ycheck:arrayConstructors failure
## Errors having to do with unavailable APIs or language features:
diff --git a/compiler/test/dotc/scala-collections.whitelist b/compiler/test/dotc/scala-collections.whitelist
index c7e5064b4..1590120d3 100644
--- a/compiler/test/dotc/scala-collections.whitelist
+++ b/compiler/test/dotc/scala-collections.whitelist
@@ -453,7 +453,7 @@
../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/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
@@ -476,7 +476,7 @@
../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/concurrent/impl/ExecutionContextImpl.scala
../scala-scala/src/library/scala/collection/parallel/package.scala
../scala-scala/src/library/scala/collection/parallel/ParIterable.scala