Skip to content

Commit 04eee0d

Browse files
committed
Rename scala-scala to scala-library.
1 parent 6a92606 commit 04eee0d

File tree

11 files changed

+32
-32
lines changed

11 files changed

+32
-32
lines changed

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
path = scala-backend
33
url = https://github.com/lampepfl/scala.git
44
branch = sharing-backend
5-
[submodule "scala-scala"]
6-
path = scala-scala
5+
[submodule "scala-library"]
6+
path = scala-library
77
url = https://github.com/lampepfl/scala.git
88
branch = dotty-library
99
[submodule "collection-strawman"]

compiler/test/dotc/tests.scala

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -215,18 +215,18 @@ class tests extends CompilerTest {
215215

216216
@Test def compileMixed = compileLine(
217217
"""../tests/pos/B.scala
218-
|../scala-scala/src/library/scala/collection/immutable/Seq.scala
219-
|../scala-scala/src/library/scala/collection/parallel/ParSeq.scala
220-
|../scala-scala/src/library/scala/package.scala
221-
|../scala-scala/src/library/scala/collection/GenSeqLike.scala
222-
|../scala-scala/src/library/scala/collection/SeqLike.scala
223-
|../scala-scala/src/library/scala/collection/generic/GenSeqFactory.scala""".stripMargin)
224-
@Test def compileIndexedSeq = compileLine("../scala-scala/src/library/scala/collection/immutable/IndexedSeq.scala")
225-
@Test def compileParSetLike = compileLine("../scala-scala/src/library/scala/collection/parallel/mutable/ParSetLike.scala")
218+
|../scala-library/src/library/scala/collection/immutable/Seq.scala
219+
|../scala-library/src/library/scala/collection/parallel/ParSeq.scala
220+
|../scala-library/src/library/scala/package.scala
221+
|../scala-library/src/library/scala/collection/GenSeqLike.scala
222+
|../scala-library/src/library/scala/collection/SeqLike.scala
223+
|../scala-library/src/library/scala/collection/generic/GenSeqFactory.scala""".stripMargin)
224+
@Test def compileIndexedSeq = compileLine("../scala-library/src/library/scala/collection/immutable/IndexedSeq.scala")
225+
@Test def compileParSetLike = compileLine("../scala-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala")
226226
@Test def compileParSetSubset = compileLine(
227-
"""../scala-scala/src/library/scala/collection/parallel/mutable/ParSetLike.scala
228-
|../scala-scala/src/library/scala/collection/parallel/mutable/ParSet.scala
229-
|../scala-scala/src/library/scala/collection/mutable/SetLike.scala""".stripMargin)(scala2mode ++ defaultOptions)
227+
"""../scala-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala
228+
|../scala-library/src/library/scala/collection/parallel/mutable/ParSet.scala
229+
|../scala-library/src/library/scala/collection/mutable/SetLike.scala""".stripMargin)(scala2mode ++ defaultOptions)
230230

231231
@Test def dottyBooted = {
232232
dottyBootedLib

compiler/test/dotty/tools/StdLibSources.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ object StdLibSources {
1010
/* For debug only */
1111
private val useExplicitWhiteList = false
1212

13-
private final val stdLibPath = "../scala-scala/src/library/"
13+
private final val stdLibPath = "../scala-library/src/library/"
1414

1515
def blacklistFile: String = "../compiler/test/dotc/scala-collections.blacklist"
1616
private def whitelistFile: String = "../compiler/test/dotc/scala-collections.whitelist"

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,24 +50,24 @@ class CompilationTests extends ParallelTesting {
5050
"compileMixed",
5151
List(
5252
"../tests/pos/B.scala",
53-
"../scala-scala/src/library/scala/collection/immutable/Seq.scala",
54-
"../scala-scala/src/library/scala/collection/parallel/ParSeq.scala",
55-
"../scala-scala/src/library/scala/package.scala",
56-
"../scala-scala/src/library/scala/collection/GenSeqLike.scala",
57-
"../scala-scala/src/library/scala/collection/SeqLike.scala",
58-
"../scala-scala/src/library/scala/collection/generic/GenSeqFactory.scala"
53+
"../scala-library/src/library/scala/collection/immutable/Seq.scala",
54+
"../scala-library/src/library/scala/collection/parallel/ParSeq.scala",
55+
"../scala-library/src/library/scala/package.scala",
56+
"../scala-library/src/library/scala/collection/GenSeqLike.scala",
57+
"../scala-library/src/library/scala/collection/SeqLike.scala",
58+
"../scala-library/src/library/scala/collection/generic/GenSeqFactory.scala"
5959
),
6060
defaultOptions
6161
) +
6262
compileFilesInDir("../tests/pos-special/spec-t5545", defaultOptions) +
63-
compileFile("../scala-scala/src/library/scala/collection/immutable/IndexedSeq.scala", defaultOptions) +
64-
compileFile("../scala-scala/src/library/scala/collection/parallel/mutable/ParSetLike.scala", defaultOptions) +
63+
compileFile("../scala-library/src/library/scala/collection/immutable/IndexedSeq.scala", defaultOptions) +
64+
compileFile("../scala-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala", defaultOptions) +
6565
compileList(
6666
"parSetSubset",
6767
List(
68-
"../scala-scala/src/library/scala/collection/parallel/mutable/ParSetLike.scala",
69-
"../scala-scala/src/library/scala/collection/parallel/mutable/ParSet.scala",
70-
"../scala-scala/src/library/scala/collection/mutable/SetLike.scala"
68+
"../scala-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala",
69+
"../scala-library/src/library/scala/collection/parallel/mutable/ParSet.scala",
70+
"../scala-library/src/library/scala/collection/mutable/SetLike.scala"
7171
),
7272
scala2Mode
7373
) +

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ class ScannerTest extends DottyTest {
6060

6161
@Test
6262
def scanScala() = {
63-
scanDir("../scala-scala/src")
63+
scanDir("../scala-library/src")
6464
}
6565
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ object desugarPackage extends DeSugarTest {
1212
val start = System.nanoTime()
1313
val startNodes = Trees.ntrees
1414
parseDir("./src")
15-
parseDir("./scala-scala/src")
15+
parseDir("./scala-library/src")
1616
val ms1 = (System.nanoTime() - start)/1000000
1717
val nodes = Trees.ntrees
1818
val buf = parsedTrees map desugarTree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ object parsePackage extends ParserTest {
6868
nodes = 0
6969
val start = System.nanoTime()
7070
parseDir("./src")
71-
parseDir("./scala-scala/src")
71+
parseDir("./scala-library/src")
7272
val ms1 = (System.nanoTime() - start)/1000000
7373
val buf = parsedTrees map transformer.transform
7474
val ms2 = (System.nanoTime() - start)/1000000

doc-tool/test/UsecaseTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,12 @@ class UsecaseTest extends DottyDocTest {
223223
}
224224

225225
@Test def checkIterator =
226-
checkFiles("../scala-scala/src/library/scala/collection/Iterator.scala" :: Nil) { _ =>
226+
checkFiles("../scala-library/src/library/scala/collection/Iterator.scala" :: Nil) { _ =>
227227
// success if typer throws no errors! :)
228228
}
229229

230230
@Test def checkIterableLike =
231-
checkFiles("../scala-scala/src/library/scala/collection/IterableLike.scala" :: Nil) { _ =>
231+
checkFiles("../scala-library/src/library/scala/collection/IterableLike.scala" :: Nil) { _ =>
232232
// success if typer throws no errors! :)
233233
}
234234
}

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ object DottyInjectedPlugin extends AutoPlugin {
996996
}
997997

998998
private def projectChecks(): Unit = {
999-
val submodules = List(new File("scala-backend"), new File("scala-scala"), new File("collection-strawman"))
999+
val submodules = List(new File("scala-backend"), new File("scala-library"), new File("collection-strawman"))
10001000
if (!submodules.forall(f => f.exists && f.listFiles().nonEmpty)) {
10011001
println(
10021002
s"""[WARNING] Missing some of the submodules

scala-library

Submodule scala-library added at c14809b

scala-scala

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)