Inline scala-{library, backend} submodules

.gitmodules

@@ -1,7 +1,3 @@
-[submodule "scala2-library"]
-	path = scala2-library
-	url = https://github.com/lampepfl/scala.git
-	branch = dotty-library2.12
 [submodule "community-build/community-projects/algebra"]
 	path = community-build/community-projects/algebra
 	url = https://github.com/dotty-staging/algebra

.vscode-template/settings.json

@@ -9,8 +9,6 @@
     "**/*.class": true,
     "**/*.hasTasty": true,
     "**/target/": true,
-    "community-build/community-projects": true,
-    "scala2-library/{doc,docs,lib,META-INF,scripts,spec,test,tools}/": true, // only allow scala-backend/src
-    "scala2-library/src/[abcefimprs]*": true
+    "community-build/community-projects": true
   }
 }

compiler/test/dotty/tools/TestSources.scala

@@ -8,7 +8,7 @@ object TestSources {
 
   // Std Lib
 
-  private final val stdLibPath = "scala2-library/src/library/"
+  private final val stdLibPath = "tests/scala2-library/src/library/"
 
   private def blacklistFile: String = "compiler/test/dotc/scala-collections.blacklist"
 

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

@@ -53,36 +53,36 @@ class CompilationTests extends ParallelTesting {
       "compileMixed",
       List(
         "tests/pos/B.scala",
-        "scala2-library/src/library/scala/collection/immutable/Seq.scala",
-        "scala2-library/src/library/scala/collection/parallel/ParSeq.scala",
-        "scala2-library/src/library/scala/package.scala",
-        "scala2-library/src/library/scala/collection/GenSeqLike.scala",
-        "scala2-library/src/library/scala/collection/SeqLike.scala",
-        "scala2-library/src/library/scala/collection/generic/GenSeqFactory.scala"
+        "tests/scala2-library/src/library/scala/collection/immutable/Seq.scala",
+        "tests/scala2-library/src/library/scala/collection/parallel/ParSeq.scala",
+        "tests/scala2-library/src/library/scala/package.scala",
+        "tests/scala2-library/src/library/scala/collection/GenSeqLike.scala",
+        "tests/scala2-library/src/library/scala/collection/SeqLike.scala",
+        "tests/scala2-library/src/library/scala/collection/generic/GenSeqFactory.scala"
       ),
       scala2Mode
     ) +
     compileFilesInDir("tests/pos-special/spec-t5545", defaultOptions) +
     compileFilesInDir("tests/pos-special/strawman-collections", defaultOptions) +
     compileFilesInDir("tests/pos-special/isInstanceOf", allowDeepSubtypes.and("-Xfatal-warnings")) +
-    compileFile("scala2-library/src/library/scala/collection/immutable/IndexedSeq.scala", defaultOptions) +
-    compileFile("scala2-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala", defaultOptions) +
+    compileFile("tests/scala2-library/src/library/scala/collection/immutable/IndexedSeq.scala", defaultOptions) +
+    compileFile("tests/scala2-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala", defaultOptions) +
     compileList(
       "parSetSubset",
       List(
-       "scala2-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala",
-       "scala2-library/src/library/scala/collection/parallel/mutable/ParSet.scala",
-       "scala2-library/src/library/scala/collection/mutable/SetLike.scala"
+       "tests/scala2-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala",
+       "tests/scala2-library/src/library/scala/collection/parallel/mutable/ParSet.scala",
+       "tests/scala2-library/src/library/scala/collection/mutable/SetLike.scala"
       ),
       scala2Mode
     ) +
     // FIXME: This fails with .times(2), see #2799
     compileList(
       "testPredefDeprecatedNonCyclic",
       List(
-        "scala2-library/src/library/scala/io/Position.scala",
-        "scala2-library/src/library/scala/Predef.scala",
-        "scala2-library/src/library/scala/deprecated.scala"
+        "tests/scala2-library/src/library/scala/io/Position.scala",
+        "tests/scala2-library/src/library/scala/Predef.scala",
+        "tests/scala2-library/src/library/scala/deprecated.scala"
       ),
       scala2Mode
     ) +

compiler/test/dotty/tools/dotc/parsing/ScannerTest.scala

@@ -60,6 +60,6 @@ class ScannerTest extends DottyTest {
 
   @Test
   def scanScala() = {
-    scanDir("../scala2-library/src")
+    scanDir("../tests/scala2-library/src")
   }
 }

compiler/test/dotty/tools/dotc/parsing/desugarPackage.scala

@@ -12,7 +12,7 @@ object desugarPackage extends DeSugarTest {
     val start = System.nanoTime()
     val startNodes = Trees.ntrees
     parseDir("./src")
-    parseDir("./scala2-library/src")
+    parseDir("./tests/scala2-library/src")
     val ms1 = (System.nanoTime() - start)/1000000
     val nodes = Trees.ntrees
     val buf = parsedTrees map desugarTree

compiler/test/dotty/tools/dotc/parsing/parsePackage.scala

@@ -68,7 +68,7 @@ object parsePackage extends ParserTest {
     nodes = 0
     val start = System.nanoTime()
     parseDir("./src")
-    parseDir("./scala2-library/src")
+    parseDir("./tests/scala2-library/src")
     val ms1 = (System.nanoTime() - start)/1000000
     val buf = parsedTrees map transformer.transform
     val ms2 = (System.nanoTime() - start)/1000000

doc-tool/test/dotty/tools/dottydoc/UsecaseTest.scala

@@ -258,12 +258,12 @@ abstract class UsecaseBase extends DottyDocTest {
   }
 
   @Test def checkIterator =
-    checkFiles("../scala2-library/src/library/scala/collection/Iterator.scala" :: Nil) { case _ =>
+    checkFiles("../tests/scala2-library/src/library/scala/collection/Iterator.scala" :: Nil) { case _ =>
       // success if typer throws no errors! :)
     }
 
   @Test def checkIterableLike =
-    checkFiles("../scala2-library/src/library/scala/collection/IterableLike.scala" :: Nil) { case _ =>
+    checkFiles("../tests/scala2-library/src/library/scala/collection/IterableLike.scala" :: Nil) { case _ =>
       // success if typer throws no errors! :)
     }
 }