Skip to content

Commit

Permalink
Remove collection-strawman submodule and tests
Browse files Browse the repository at this point in the history
  • Loading branch information
OlivierBlanvillain committed Feb 5, 2019
1 parent 03887b7 commit 2ef4d67
Show file tree
Hide file tree
Showing 22 changed files with 16 additions and 23 deletions.
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions bench/scripts/collection-strawman-cold.sh

This file was deleted.

2 changes: 0 additions & 2 deletions bench/scripts/collection-strawman.sh

This file was deleted.

1 change: 0 additions & 1 deletion collection-strawman
Submodule collection-strawman deleted from 58fd6b
1 change: 1 addition & 0 deletions community-build/community-projects/ScalaPB
Submodule ScalaPB added at 7b2d8a
1 change: 1 addition & 0 deletions community-build/community-projects/algebra
Submodule algebra added at 812caf
1 change: 1 addition & 0 deletions community-build/community-projects/betterfiles
Submodule betterfiles added at 9f14d4
1 change: 1 addition & 0 deletions community-build/community-projects/fastparse
Submodule fastparse added at 2a72cb
1 change: 1 addition & 0 deletions community-build/community-projects/minitest
Submodule minitest added at d2b8b6
1 change: 1 addition & 0 deletions community-build/community-projects/pdbp
Submodule pdbp added at 0c1fe0
1 change: 1 addition & 0 deletions community-build/community-projects/scalacheck
Submodule scalacheck added at 6b3fe5
1 change: 1 addition & 0 deletions community-build/community-projects/scalap
Submodule scalap added at b66556
1 change: 1 addition & 0 deletions community-build/community-projects/scalatest
Submodule scalatest added at cfc402
1 change: 1 addition & 0 deletions community-build/community-projects/scopt
Submodule scopt added at fedd60
1 change: 1 addition & 0 deletions community-build/community-projects/sourcecode
Submodule sourcecode added at bed617
1 change: 1 addition & 0 deletions community-build/community-projects/squants
Submodule squants added at bfa61a
1 change: 1 addition & 0 deletions community-build/community-projects/stdLib213
Submodule stdLib213 added at 655bca
1 change: 1 addition & 0 deletions community-build/dotty-bootstrapped.version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.13.0-bin-SNAPSHOT
1 change: 1 addition & 0 deletions community-build/sbt-dotty.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.2.7-SNAPSHOT")
1 change: 0 additions & 1 deletion compiler/test/dotty/tools/dotc/CompilationTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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")) +
Expand Down
12 changes: 0 additions & 12 deletions compiler/test/dotty/tools/dotc/IdempotencyTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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")) +
Expand All @@ -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"))
Expand All @@ -70,8 +60,6 @@ class IdempotencyTests extends ParallelTesting {
}

val allTests = {
// Disabled until strawman is fixed
// strawmanIdempotency +
orderIdempotency +
posIdempotency
}
Expand Down
2 changes: 1 addition & 1 deletion project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2ef4d67

Please sign in to comment.