Skip to content

Commit 7020f13

Browse files
committed
Merge branch 'master' into 'topic/sbt1'
2 parents b088b84 + d5ee92b commit 7020f13

File tree

169 files changed

+3967
-520
lines changed

Some content is hidden

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

169 files changed

+3967
-520
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,6 @@ compiler/after-pickling.txt
7474
*.dotty-ide-version
7575

7676
*.decompiled.out
77+
78+
# The vscode app for testing
79+
vscode-dotty/.vscode-test

AUTHORS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,7 @@ The majority of the dotty codebase is new code, with the exception of the compon
7171
> the [compiler bridge in sbt 0.13](https://github.com/sbt/sbt/tree/0.13/compile/interface/src/main/scala/xsbt),
7272
> but has been heavily adapted and refactored.
7373
> Original authors were Mark Harrah, Grzegorz Kossakowski, Martin Duhemm, Adriaan Moors and others.
74+
75+
`dotty.tools.dotc.plugins`
76+
77+
> Adapted from [scala/scala](https://github.com/scala/scala) with some modifications. They were originally authored by Lex Spoon, Som Snytt, Adriaan Moors, Paul Phillips and others.

bench/scripts/collection-vector.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env bash
2+
sbt "dotty-bench-bootstrapped/jmh:run 40 40 3 bench/tests/Vector.scala"

0 commit comments

Comments
 (0)