Remove collection-strawman submodule and tests

OlivierBlanvillain · OlivierBlanvillain · commit 2ef4d671d32e · 2019-02-05T14:52:37.000+01:00
diff --git a/.gitmodules b/.gitmodules
@@ -6,7 +6,3 @@
 	path = scala2-library
 	url = https://github.com/lampepfl/scala.git
 	branch = dotty-library2.12
-[submodule "collection-strawman"]
-	path = collection-strawman
-	url = https://github.com/dotty-staging/collection-strawman.git
-	branch = dotty
diff --git a/bench/scripts/collection-strawman-cold.sh b/bench/scripts/collection-strawman-cold.sh
diff --git a/bench/scripts/collection-strawman.sh b/bench/scripts/collection-strawman.sh
diff --git a/collection-strawman b/collection-strawman
diff --git a/community-build/community-projects/ScalaPB b/community-build/community-projects/ScalaPB
@@ -0,0 +1 @@
+Subproject commit 7b2d8ac0487d52b076b751d6a590a879d71fc7c3
diff --git a/community-build/community-projects/algebra b/community-build/community-projects/algebra
@@ -0,0 +1 @@
+Subproject commit 812caf0292144ae0e3a00723e235b2563c351d7d
diff --git a/community-build/community-projects/betterfiles b/community-build/community-projects/betterfiles
@@ -0,0 +1 @@
+Subproject commit 9f14d47276848997d97780987d0320509f8b368d
diff --git a/community-build/community-projects/fastparse b/community-build/community-projects/fastparse
@@ -0,0 +1 @@
+Subproject commit 2a72cbec7d8cad5da8cd2d22418a5551fc921a1f
diff --git a/community-build/community-projects/minitest b/community-build/community-projects/minitest
@@ -0,0 +1 @@
+Subproject commit d2b8b630ad448300673dc97cbea01ce56ffaec38
diff --git a/community-build/community-projects/pdbp b/community-build/community-projects/pdbp
@@ -0,0 +1 @@
+Subproject commit 0c1fe0a5fd681ff4d94a58dc6f73e019982e9d78
diff --git a/community-build/community-projects/scalacheck b/community-build/community-projects/scalacheck
@@ -0,0 +1 @@
+Subproject commit 6b3fe5165ccc46db460be051ef042d002a9b996a
diff --git a/community-build/community-projects/scalap b/community-build/community-projects/scalap
@@ -0,0 +1 @@
+Subproject commit b66556a551fe3cec24d0fea6841401d99557b1e0
diff --git a/community-build/community-projects/scalatest b/community-build/community-projects/scalatest
@@ -0,0 +1 @@
+Subproject commit cfc40267d9fbc6bc501f73554c7aeb1abefea3cd
diff --git a/community-build/community-projects/scopt b/community-build/community-projects/scopt
@@ -0,0 +1 @@
+Subproject commit fedd604caa175bd0791cb21179b700ca9fcf5698
diff --git a/community-build/community-projects/sourcecode b/community-build/community-projects/sourcecode
@@ -0,0 +1 @@
+Subproject commit bed617b04c066517fddd235c73f8b5db3bdc0950
diff --git a/community-build/community-projects/squants b/community-build/community-projects/squants
@@ -0,0 +1 @@
+Subproject commit bfa61a92947b6ac1eab384fd5e46f2fbfe696c4a
diff --git a/community-build/community-projects/stdLib213 b/community-build/community-projects/stdLib213
@@ -0,0 +1 @@
+Subproject commit 655bca8ee5b842e7ceba9709c307701cf36c10bf
diff --git a/community-build/dotty-bootstrapped.version b/community-build/dotty-bootstrapped.version
@@ -0,0 +1 @@
+0.13.0-bin-SNAPSHOT
diff --git a/community-build/sbt-dotty.sbt b/community-build/sbt-dotty.sbt
@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.2.7-SNAPSHOT")
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -63,7 +63,6 @@ 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")) +
diff --git a/compiler/test/dotty/tools/dotc/IdempotencyTests.scala b/compiler/test/dotty/tools/dotc/IdempotencyTests.scala
@@ -32,9 +32,6 @@ class IdempotencyTests extends ParallelTesting {
 
     def sourcesFrom(dir: Path) = CompilationTests.sources(Files.walk(dir))
 
-    val strawmanSources = sourcesFrom(Paths.get("collection-strawman/collections/src/main"))
-    val strawmanSourcesSorted = strawmanSources.sorted
-    val strawmanSourcesRevSorted = strawmanSourcesSorted.reverse
 
     val posIdempotency = {
       compileFilesInDir("tests/pos", opt)(TestGroup("idempotency/posIdempotency1")) +
@@ -51,13 +48,6 @@ class IdempotencyTests extends ParallelTesting {
       }).reduce(_ + _)
     }
 
-    val strawmanIdempotency = {
-      compileList("strawman0", strawmanSources, opt) +
-      compileList("strawman1", strawmanSources, opt) +
-      compileList("strawman2", strawmanSourcesSorted, opt) +
-      compileList("strawman3", strawmanSourcesRevSorted, opt)
-    }
-
     def check(name: String) = {
       val files = List(s"tests/idempotency/$name.scala", "tests/idempotency/IdempotencyCheck.scala")
       compileList(name, files, defaultOptions)(TestGroup("idempotency/check"))
@@ -70,8 +60,6 @@ class IdempotencyTests extends ParallelTesting {
     }
 
     val allTests = {
-      // Disabled until strawman is fixed
-      // strawmanIdempotency +
       orderIdempotency +
       posIdempotency
     }
diff --git a/project/Build.scala b/project/Build.scala
@@ -162,7 +162,7 @@ object Build {
       }
 
       // Make sure all submodules are properly cloned
-      val submodules = List("scala-backend", "scala2-library", "collection-strawman")
+      val submodules = List("scala-backend", "scala2-library")
       if (!submodules.forall(exists)) {
         sLog.value.log(Level.Error,
           s"""Missing some of the submodules

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit 7b2d8ac0487d52b076b751d6a590a879d71fc7c3`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit 812caf0292144ae0e3a00723e235b2563c351d7d`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit 9f14d47276848997d97780987d0320509f8b368d`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit 2a72cbec7d8cad5da8cd2d22418a5551fc921a1f`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit d2b8b630ad448300673dc97cbea01ce56ffaec38`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit 0c1fe0a5fd681ff4d94a58dc6f73e019982e9d78`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit 6b3fe5165ccc46db460be051ef042d002a9b996a`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit b66556a551fe3cec24d0fea6841401d99557b1e0`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit cfc40267d9fbc6bc501f73554c7aeb1abefea3cd`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit fedd604caa175bd0791cb21179b700ca9fcf5698`