Merge pull request #3423 from dotty-staging/update-strawman-2

Upgrade strawman submodule

Author: nicolasstucki

bench/scripts/collection-strawman-cold.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-find collection-strawman/src/main/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run 0 1 10" {} + | sbt
+find collection-strawman/collections/src/main/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run 0 1 10" {} + | sbt

bench/scripts/collection-strawman.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-find collection-strawman/src/main/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run" {} + | sbt
+find collection-strawman/collections/src/main/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run" {} + | sbt

collection-strawman

@@ -32,7 +32,7 @@ class IdempotencyTests extends ParallelTesting {
 
     def sourcesFrom(dir: Path) = CompilationTests.sources(Files.walk(dir))
 
-    val strawmanSources = sourcesFrom(Paths.get("../collection-strawman/src/main"))
+    val strawmanSources = sourcesFrom(Paths.get("../collection-strawman/collections/src/main"))
     val strawmanSourcesSorted = strawmanSources.sorted
     val strawmanSourcesRevSorted = strawmanSourcesSorted.reverse
 

compiler/test/dotty/tools/dotc/IdempotencyTests.scala

@@ -29,7 +29,7 @@ class LinkOptimiseTests extends ParallelTesting {
   @Test def linkOptimise: Unit = {
     // Setup and compile libraries
     def strawmanLibrary =
-      compileDir("../collection-strawman/src/main", defaultOptions)
+      compileDir("../collection-strawman/collections/src/main", defaultOptions)
     def linkCustomLib =
       compileDir("../tests/link/custom-lib", defaultOptions)