Merge pull request #4724 from dotty-staging/collections-strawman

allanrenucci · web-flow · commit 1d446b53c7dd · 2018-08-03T12:09:35.000+02:00
Add collections-strawman to our tests
diff --git a/.gitmodules b/.gitmodules
@@ -8,5 +8,5 @@
 	branch = dotty-library2.12
 [submodule "collection-strawman"]
 	path = collection-strawman
-	url = https://github.com/scala/collection-strawman.git
-	branch = master
+	url = https://github.com/dotty-staging/collection-strawman.git
+	branch = dotty
diff --git a/collection-strawman b/collection-strawman
@@ -1 +1 @@
-Subproject commit abd20a60f730ef478551ee68ed4326f8bf582dd8
+Subproject commit 58fd6b002889d071e12223c403cdf8d82b43c298
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -62,6 +62,7 @@ class CompilationTests extends ParallelTesting {
       ),
       scala2Mode
     ) +
+    compileDir("collection-strawman/collections/src/main", defaultOptions.and("-Yno-imports")) +
     compileFilesInDir("tests/pos-special/spec-t5545", defaultOptions) +
     compileFilesInDir("tests/pos-special/strawman-collections", defaultOptions) +
     compileFilesInDir("tests/pos-special/isInstanceOf", allowDeepSubtypes.and("-Xfatal-warnings")) +
