Skip to content

Commit 1abe134

Browse files
committed
Say goodbye to the 2.12 stdlib
It's too hard to maintain it on top of the 2.13 stdlib, too bad because it's proven to be a great torture test of the compiler.
1 parent 4fb4495 commit 1abe134

File tree

706 files changed

+0
-78735
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

706 files changed

+0
-78735
lines changed

compiler/test/dotty/tools/TestSources.scala

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@ import scala.collection.JavaConverters._
77

88
object TestSources {
99

10-
// Std Lib
11-
def stdLibSources: List[String] = {
12-
val blacklisted = List(
13-
"volatile.scala", // see #5610
14-
)
15-
sources(Paths.get("tests/scala2-library/src/library/"), excludedFiles = blacklisted)
16-
}
17-
1810
// pos tests lists
1911

2012
def posFromTastyBlacklistFile: String = "compiler/test/dotc/pos-from-tasty.blacklist"

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

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,9 @@ class CompilationTests extends ParallelTesting {
3232

3333
// Positive tests ------------------------------------------------------------
3434

35-
// @Test // enable to test compileStdLib separately with detailed stats
36-
def compileStdLibOnly: Unit = {
37-
implicit val testGroup: TestGroup = TestGroup("compileStdLibOnly")
38-
compileList("compileStdLib", TestSources.stdLibSources, scala2Mode.and("-migration", "-Yno-inline"))
39-
}.checkCompile()
40-
4135
@Test def pos: Unit = {
4236
implicit val testGroup: TestGroup = TestGroup("compilePos")
4337
aggregateTests(
44-
compileList("compileStdLib", TestSources.stdLibSources, scala2Mode.and("-migration", "-Yno-inline")),
4538
compileFile("tests/pos/nullarify.scala", defaultOptions.and("-Ycheck:nullarify")),
4639
compileFile("tests/pos-scala2/rewrites.scala", scala2Mode.and("-rewrite")).copyToTarget(),
4740
compileFile("tests/pos-special/utf8encoded.scala", explicitUTF8),
@@ -51,43 +44,9 @@ class CompilationTests extends ParallelTesting {
5144
compileFile("tests/pos-special/completeFromSource/Test3.scala", defaultOptions.and("-sourcepath", "tests/pos-special", "-scansource")),
5245
compileFile("tests/pos-special/completeFromSource/nested/Test4.scala", defaultOptions.and("-sourcepath", "tests/pos-special", "-scansource")),
5346
compileFilesInDir("tests/pos-special/fatal-warnings", defaultOptions.and("-Xfatal-warnings", "-feature")),
54-
compileList(
55-
"compileMixed",
56-
List(
57-
"tests/pos/B.scala",
58-
"tests/scala2-library/src/library/scala/collection/immutable/Seq.scala",
59-
"tests/scala2-library/src/library/scala/collection/parallel/ParSeq.scala",
60-
"tests/scala2-library/src/library/scala/package.scala",
61-
"tests/scala2-library/src/library/scala/collection/GenSeqLike.scala",
62-
"tests/scala2-library/src/library/scala/collection/SeqLike.scala",
63-
"tests/scala2-library/src/library/scala/collection/generic/GenSeqFactory.scala"
64-
),
65-
scala2Mode
66-
),
6747
compileFilesInDir("tests/pos-special/spec-t5545", defaultOptions),
6848
compileFilesInDir("tests/pos-special/strawman-collections", defaultOptions),
6949
compileFilesInDir("tests/pos-special/isInstanceOf", allowDeepSubtypes.and("-Xfatal-warnings")),
70-
compileFile("tests/scala2-library/src/library/scala/collection/immutable/IndexedSeq.scala", defaultOptions),
71-
compileFile("tests/scala2-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala", defaultOptions),
72-
compileList(
73-
"parSetSubset",
74-
List(
75-
"tests/scala2-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala",
76-
"tests/scala2-library/src/library/scala/collection/parallel/mutable/ParSet.scala",
77-
"tests/scala2-library/src/library/scala/collection/mutable/SetLike.scala"
78-
),
79-
scala2Mode
80-
),
81-
// FIXME: This fails with .times(2), see #2799
82-
compileList(
83-
"testPredefDeprecatedNonCyclic",
84-
List(
85-
"tests/scala2-library/src/library/scala/io/Position.scala",
86-
"tests/scala2-library/src/library/scala/Predef.scala",
87-
"tests/scala2-library/src/library/scala/deprecated.scala"
88-
),
89-
scala2Mode
90-
),
9150
compileFilesInDir("tests/new", defaultOptions),
9251
compileFilesInDir("tests/pos-scala2", scala2Mode),
9352
compileFilesInDir("tests/pos", defaultOptions),

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,4 @@ class ScannerTest extends DottyTest {
5757
def scanDotty() = {
5858
scanDir("src")
5959
}
60-
61-
@Test
62-
def scanScala() = {
63-
scanDir("../tests/scala2-library/src")
64-
}
6560
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ object desugarPackage extends DeSugarTest {
1212
val start = System.nanoTime()
1313
val startNodes = Trees.ntrees
1414
parseDir("./src")
15-
parseDir("./tests/scala2-library/src")
1615
val ms1 = (System.nanoTime() - start)/1000000
1716
val nodes = Trees.ntrees
1817
val buf = parsedTrees map desugarTree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ object parsePackage extends ParserTest {
6666
nodes = 0
6767
val start = System.nanoTime()
6868
parseDir("./src")
69-
parseDir("./tests/scala2-library/src")
7069
val ms1 = (System.nanoTime() - start)/1000000
7170
val buf = parsedTrees map transformer.transform
7271
val ms2 = (System.nanoTime() - start)/1000000

tests/scala2-library/src/library/scala/AnyValCompanion.scala

Lines changed: 0 additions & 21 deletions
This file was deleted.

tests/scala2-library/src/library/scala/App.scala

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)