Skip to content

Upgrade strawman submodule #3423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 1, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bench/scripts/collection-strawman-cold.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion bench/scripts/collection-strawman.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion collection-strawman
2 changes: 1 addition & 1 deletion compiler/test/dotty/tools/dotc/IdempotencyTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion compiler/test/dotty/tools/dotc/LinkOptimiseTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down