aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2016-01-15 16:48:29 +0100
committerGuillaume Martres <smarter@ubuntu.com>2016-01-16 21:26:55 +0100
commit8e84133598f879c1cb0ad4b9faf2a90c0403536f (patch)
treec36edb75ae0579cada43f7f487c4a30b4cc1dd3c /test
parenta4f35e2cf41dd38a35688f351510603165c6f89f (diff)
downloaddotty-8e84133598f879c1cb0ad4b9faf2a90c0403536f.tar.gz
dotty-8e84133598f879c1cb0ad4b9faf2a90c0403536f.tar.bz2
dotty-8e84133598f879c1cb0ad4b9faf2a90c0403536f.zip
Fix checkNonCyclic.
Need to also look info refined types. Need to handle case where we hit a NoCompleter again. Fixes #974 and makes MutableSortedSetFactory in stdlib compile.
Diffstat (limited to 'test')
-rw-r--r--test/dotc/scala-collections.whitelist2
-rw-r--r--test/dotc/tests.scala1
2 files changed, 2 insertions, 1 deletions
diff --git a/test/dotc/scala-collections.whitelist b/test/dotc/scala-collections.whitelist
index 2abb16c1e..f6a13cc72 100644
--- a/test/dotc/scala-collections.whitelist
+++ b/test/dotc/scala-collections.whitelist
@@ -266,7 +266,7 @@
./scala-scala/src/library/scala/collection/generic/ParFactory.scala
# https://github.com/lampepfl/dotty/issues/974 -> @smarter
-#./scala-scala/src/library/scala/collection/generic/MutableSortedSetFactory.scala
+./scala-scala/src/library/scala/collection/generic/MutableSortedSetFactory.scala
# cyclic reference, maybe related to #974 -> @smarter
#./scala-scala/src/library/scala/collection/generic/ParSetFactory.scala
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala
index 2810a8b55..b61783b0b 100644
--- a/test/dotc/tests.scala
+++ b/test/dotc/tests.scala
@@ -158,6 +158,7 @@ class tests extends CompilerTest {
@Test def neg_finalSealed = compileFile(negDir, "final-sealed", xerrors = 2)
@Test def neg_i705 = compileFile(negDir, "i705-inner-value-class", xerrors = 7)
@Test def neg_i866 = compileFile(negDir, "i866", xerrors = 2)
+ @Test def neg_i974 = compileFile(negDir, "i974", xerrors = 2)
@Test def neg_moduleSubtyping = compileFile(negDir, "moduleSubtyping", xerrors = 4)
@Test def neg_escapingRefs = compileFile(negDir, "escapingRefs", xerrors = 2)
@Test def neg_instantiateAbstract = compileFile(negDir, "instantiateAbstract", xerrors = 8)