Skip to content

Commit c4462a7

Browse files
armanbilgearmanbilge
committed
Merge branch 'master' into topic/spire
2 parents b86fe0f + db31073 commit c4462a7

File tree

201 files changed

+2788
-784
lines changed

Some content is hidden

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

201 files changed

+2788
-784
lines changed

‎.github/ISSUE_TEMPLATE/bug.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ If you're not sure what version you're using, run `print scalaVersion` from sbt
1414

1515
## Minimized code
1616

17+
<!--
18+
This code should be self contained, compilable (with possible failures) and as small as possible.
19+
20+
Ideally, we should be able to just copy this code in a file and run `scalac` (and maybe `scala`) to reproduce the issue.
21+
-->
22+
1723
```Scala
1824
println("hello, world")
1925
```

‎.github/ISSUE_TEMPLATE/crash.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ If you're not sure what version you're using, run `print scalaVersion` from sbt
1414

1515
## Minimized code
1616

17+
<!--
18+
This code should be self contained, compilable (with possible failures) and as small as possible.
19+
20+
Ideally, we should be able to just copy this code in a file and run `scalac` (and maybe `scala`) to reproduce the issue.
21+
-->
22+
1723
```Scala
1824
println("hello, world")
1925
```

‎.github/ISSUE_TEMPLATE/syntax-highlight.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
---
22
name: Syntax highlighting
3-
about: Please create a syntax highlighting issue here https://github.com/scala/vscode-scala-syntax/issues
3+
about: ''
44
title: ''
55
labels: ''
66
assignees: ''
77

88
---
99

10-
Please create a syntax highlighting issue here: [scala/vscode-scala-syntax](https://github.com/scala/vscode-scala-syntax/issues).
10+
Please create a syntax highlighting issue here
11+
* VS Code / GitHub: https://github.com/scala/vscode-scala-syntax/issues
12+
* IntelliJ: https://youtrack.jetbrains.com/issues/SCL?q=tag:%20%7BScala%203%7D%20tag:%20%7BSyntax%20Highlighting%7D
13+
* highlight.js: https://github.com/highlightjs/highlight.js/issues

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,9 @@
213213
[submodule "community-build/community-projects/scala-java8-compat"]
214214
path = community-build/community-projects/scala-java8-compat
215215
url = https://github.com/dotty-staging/scala-java8-compat.git
216+
[submodule "community-build/community-projects/specs2"]
217+
path = community-build/community-projects/specs2
218+
url = https://github.com/dotty-staging/specs2.git
216219
[submodule "community-build/community-projects/spire"]
217220
path = community-build/community-projects/spire
218221
url = https://github.com/typelevel/spire.git

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Dotty
33
[![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amaster)
44
[![Join the chat at https://gitter.im/scala/scala](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scala/scala?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
55

6-
* [Homepage](http://dotty.epfl.ch)
6+
* [Homepage](https://dotty.epfl.ch)
77
* [Documentation](https://dotty.epfl.ch/docs)
88

99
Try it out

‎bench/profiles/ci.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
scripts:
22

33
re2s:
4-
- measure 1 1 1 $(find $PROG_HOME/tests/re2s/src -name *.scala)
4+
- measure -wi 1 -i 1 -f 1 -- $(find $PROG_HOME/tests/re2s/src -name *.scala)
55

66
implicit-cache:
7-
- measure 1 1 1 $PROG_HOME/dotty/tests/bench/implicit_cache.scala
7+
- measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/implicit_cache.scala
88

99
implicit-cache-from-tasty:
1010
- source $PROG_HOME/dotty/bench/scripts/implicit-cache-from-tasty
1111

1212
implicit-scope-loop:
13-
- measure 1 1 1 $PROG_HOME/dotty/tests/bench/implicit-scope-loop.scala
13+
- measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/implicit-scope-loop.scala
1414

1515
i1535:
16-
- measure 1 1 1 $PROG_HOME/dotty/tests/bench/i1535.scala
16+
- measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/i1535.scala
1717

1818
i1687:
19-
- measure 1 1 1 $PROG_HOME/dotty/tests/bench/i1687.scala
19+
- measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/i1687.scala
2020

2121
empty-class:
22-
- measure 1 1 1 $PROG_HOME/dotty/tests/bench/empty-class.scala
22+
- measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/empty-class.scala
2323

2424
empty-object:
25-
- measure 1 1 1 $PROG_HOME/dotty/tests/bench/empty-object.scala
25+
- measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/empty-object.scala
2626

2727
empty-file:
28-
- measure 1 1 1 $PROG_HOME/dotty/tests/bench/empty-file.scala
28+
- measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/empty-file.scala
2929

3030
patmatexhaust:
31-
- measure 1 1 1 $PROG_HOME/dotty/tests/bench/patmatexhaust.scala
31+
- measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/patmatexhaust.scala
3232

3333
exhaustivity-I:
34-
- measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-I.scala
34+
- measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/exhaustivity-I.scala
3535

3636
exhaustivity-S:
37-
- measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-S.scala
37+
- measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/exhaustivity-S.scala
3838

3939
exhaustivity-T:
40-
- measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-T.scala
40+
- measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/exhaustivity-T.scala
4141

4242
exhaustivity-V:
43-
- measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-V.scala
43+
- measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/exhaustivity-V.scala
4444

4545
implicitNums:
46-
- measure 1 1 1 $PROG_HOME/dotty/tests/bench/implicitNums.scala
46+
- measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/implicitNums.scala
4747

4848
implicitNums-from-tasty:
4949
- source $PROG_HOME/dotty/bench/scripts/implicitNums-from-tasty
5050

5151
inductive-implicits:
52-
- measure 1 1 1 $PROG_HOME/dotty/tests/bench/inductive-implicits.scala
52+
- measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/inductive-implicits.scala
5353

5454
scalap:
5555
- source $PROG_HOME/dotty/bench/scripts/scalap

‎bench/profiles/empty.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ charts:
2121
scripts:
2222

2323
empty-class:
24-
- measure $PROG_HOME/dotty/tests/bench/empty-class.scala
24+
- measure -- $PROG_HOME/dotty/tests/bench/empty-class.scala
2525

2626
empty-object:
27-
- measure $PROG_HOME/dotty/tests/bench/empty-object.scala
27+
- measure -- $PROG_HOME/dotty/tests/bench/empty-object.scala
2828

2929
empty-file:
30-
- measure $PROG_HOME/dotty/tests/bench/empty-file.scala
30+
- measure -- $PROG_HOME/dotty/tests/bench/empty-file.scala
3131

3232
config:
3333
pr_base_url: "https://github.com/lampepfl/dotty/pull/"

‎bench/profiles/exhaustivity.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,28 +50,28 @@ charts:
5050
scripts:
5151

5252
patmatexhaust:
53-
- measure 20 40 3 $PROG_HOME/dotty/tests/bench/patmatexhaust.scala
53+
- measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/bench/patmatexhaust.scala
5454

5555
exhaustivity-I:
56-
- measure 20 40 3 $PROG_HOME/dotty/tests/bench/exhaustivity-I.scala
56+
- measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/bench/exhaustivity-I.scala
5757

5858
exhaustivity-S:
59-
- measure 20 40 3 $PROG_HOME/dotty/tests/bench/exhaustivity-S.scala
59+
- measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/bench/exhaustivity-S.scala
6060

6161
exhaustivity-T:
62-
- measure 20 40 3 $PROG_HOME/dotty/tests/bench/exhaustivity-T.scala
62+
- measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/bench/exhaustivity-T.scala
6363

6464
exhaustivity-V:
65-
- measure 20 40 3 $PROG_HOME/dotty/tests/bench/exhaustivity-V.scala
65+
- measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/bench/exhaustivity-V.scala
6666

6767
exhaustivity-mips:
68-
- measure 20 40 3 $PROG_HOME/dotty/tests/patmat/i7186.scala
68+
- measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/patmat/i7186.scala
6969

7070
exhaustivity-i12241:
71-
- measure 20 40 3 $PROG_HOME/dotty/tests/patmat/i12241.scala
71+
- measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/patmat/i12241.scala
7272

7373
exhaustivity-i12358:
74-
- measure 20 40 3 $PROG_HOME/dotty/tests/patmat/i12358.scala
74+
- measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/patmat/i12358.scala
7575

7676
config:
7777
pr_base_url: "https://github.com/lampepfl/dotty/pull/"

‎bench/profiles/implicits.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ charts:
3030
scripts:
3131

3232
implicit-cache:
33-
- measure $PROG_HOME/dotty/tests/bench/implicit_cache.scala
33+
- measure -- $PROG_HOME/dotty/tests/bench/implicit_cache.scala
3434

3535
implicit-cache-from-tasty:
3636
- source $PROG_HOME/dotty/bench/scripts/implicit-cache-from-tasty
3737

3838
implicit-scope-loop:
39-
- measure $PROG_HOME/dotty/tests/bench/implicit-scope-loop.scala
39+
- measure -- $PROG_HOME/dotty/tests/bench/implicit-scope-loop.scala
4040

4141
inductive-implicits:
42-
- measure $PROG_HOME/dotty/tests/bench/inductive-implicits.scala
42+
- measure -- $PROG_HOME/dotty/tests/bench/inductive-implicits.scala
4343

4444
implicitNums:
45-
- measure $PROG_HOME/dotty/tests/bench/implicitNums.scala
45+
- measure -- $PROG_HOME/dotty/tests/bench/implicitNums.scala
4646

4747
implicitNums-from-tasty:
4848
- source $PROG_HOME/dotty/bench/scripts/implicitNums-from-tasty

‎bench/profiles/misc.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ charts:
1515
scripts:
1616

1717
i1535:
18-
- measure $PROG_HOME/dotty/tests/bench/i1535.scala
18+
- measure -- $PROG_HOME/dotty/tests/bench/i1535.scala
1919

2020
i1687:
21-
- measure $PROG_HOME/dotty/tests/bench/i1687.scala
21+
- measure -- $PROG_HOME/dotty/tests/bench/i1687.scala

0 commit comments

Comments
 (0)