Skip to content

Commit 0146816

Browse files
soronposoronpo
committed
Merge branch 'master' of https://github.com/lampepfl/dotty into ct_ops_expansion
2 parents 9570a88 + 968dd1b commit 0146816

File tree

679 files changed

+10543
-3948
lines changed

Some content is hidden

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

679 files changed

+10543
-3948
lines changed

‎.github/workflows/ci.yaml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
117117
- name: MiMa
118118
run: |
119-
./project/scripts/sbt ";scala3-interfaces/mimaReportBinaryIssues ;scala3-library-bootstrapped/mimaReportBinaryIssues ;scala3-library-bootstrappedJS/mimaReportBinaryIssues"
119+
./project/scripts/sbt ";scala3-interfaces/mimaReportBinaryIssues ;scala3-library-bootstrapped/mimaReportBinaryIssues ;scala3-library-bootstrappedJS/mimaReportBinaryIssues; tasty-core-bootstrapped/mimaReportBinaryIssues"
120120
121121
test_windows_fast:
122122
runs-on: [self-hosted, Windows]
@@ -470,9 +470,12 @@ jobs:
470470
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
471471
env:
472472
NIGHTLYBUILD: yes
473-
BOT_TOKEN: ${{ secrets.BOT_TOKEN }} # If you need to change this:
474-
# Generate one at https://github.com/settings/tokens
475-
# Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website
473+
DOTTY_WEBSITE_BOT_TOKEN: ${{ secrets.BOT_TOKEN }} # If you need to change this:
474+
# Generate one at https://github.com/settings/tokens
475+
# Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website
476+
DOCS_SCALALANG_BOT_TOKEN: ${{ secrets.DOCS_SCALALANG_BOT_TOKEN }} # If you need to change this:
477+
# Generate one at https://github.com/settings/tokens
478+
# Make sure you have the write permissions to the repo: https://github.com/scala/docs.scala-lang
476479

477480
steps:
478481
- name: Reset existing repo
@@ -494,14 +497,26 @@ jobs:
494497
run: |
495498
./project/scripts/genDocs -doc-snapshot
496499
497-
- name: Deploy Website
500+
- name: Deploy Website to dotty-website
498501
uses: peaceiris/actions-gh-pages@v3
499502
with:
500-
personal_token: ${{ secrets.BOT_TOKEN }}
503+
personal_token: ${{ env.DOTTY_WEBSITE_BOT_TOKEN }}
501504
publish_dir: docs/_site
502505
external_repository: lampepfl/dotty-website
503506
publish_branch: gh-pages
504507

508+
- name: Generate docs.scala-lang preprocessed files
509+
run: |
510+
./project/scripts/genDocsScalaLang
511+
512+
- name: Deploy Website to docs.scala-lang
513+
uses: peaceiris/actions-gh-pages@v3
514+
with:
515+
personal_token: ${{ env.DOCS_SCALALANG_BOT_TOKEN }}
516+
publish_dir: docsScalaLang
517+
external_repository: BarkingBad/docs.scala-lang
518+
publish_branch: dev
519+
505520
publish_release:
506521
runs-on: [self-hosted, Linux]
507522
container:

‎.github/workflows/scaladoc.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,14 @@ jobs:
7575
7676
stdlib-sourcelinks-test:
7777
runs-on: ubuntu-latest
78-
if: "( github.event_name == 'pull_request'
78+
# if false - disable flaky test
79+
if: "false && (( github.event_name == 'pull_request'
7980
&& !contains(github.event.pull_request.body, '[skip ci]')
8081
&& !contains(github.event.pull_request.body, '[skip docs]')
8182
)
8283
|| contains(github.event.ref, 'scaladoc')
8384
|| contains(github.event.ref, 'scala3doc')
84-
|| contains(github.event.ref, 'master')"
85+
|| contains(github.event.ref, 'master'))"
8586

8687
steps:
8788
- name: Git Checkout
@@ -93,4 +94,4 @@ jobs:
9394
java-version: 8
9495

9596
- name: Test sourcelinks to stdlib
96-
run: ./project/scripts/sbt scaladoc/sourceLinksIntegrationTest:test
97+
run: true # ./project/scripts/sbt scaladoc/sourceLinksIntegrationTest:test

‎.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,10 @@ cs
102102

103103
# Coursier test product
104104
compiler/test-coursier/run/*.jar
105+
106+
# Docs
107+
docs-for-dotty-page/*
108+
109+
# docs.scala-lang deplyment temp dir
110+
docsScalaLang/
111+
docs/_site/

‎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

‎bench/profiles/projects.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ charts:
2626

2727
scripts:
2828
dotty:
29-
- measure -with-compiler $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java)
29+
- measure -- -with-compiler $ $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java)
3030

3131
re2s:
32-
- measure $(find $PROG_HOME/tests/re2s/src -name *.scala)
32+
- measure -- $(find $PROG_HOME/tests/re2s/src -name *.scala)
3333

3434
# scalapb:
3535
# - source $PROG_HOME/dotty/bench/scripts/scalapb

‎bench/profiles/sbt.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ charts:
99

1010
scripts:
1111
dotty-sbt:
12-
- measure -with-compiler -Yforce-sbt-phases -with-dotty $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java)
12+
- measure -- -with-compiler $ -Yforce-sbt-phases -with-dotty $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java)
1313

1414
config:
1515
pr_base_url: "https://github.com/lampepfl/dotty/pull/"

‎bench/profiles/tuples.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@ charts:
4444
scripts:
4545

4646
tuple22-creation-apply:
47-
- measure $PROG_HOME/dotty/tests/bench/tuple22-creation-apply.scala
47+
- measure -- $PROG_HOME/dotty/tests/bench/tuple22-creation-apply.scala
4848

4949
tuple22-creation-cons:
50-
- measure $PROG_HOME/dotty/tests/bench/tuple22-creation-cons.scala
50+
- measure -- $PROG_HOME/dotty/tests/bench/tuple22-creation-cons.scala
5151

5252
tuple22-tails:
53-
- measure $PROG_HOME/dotty/tests/bench/tuple22-tails.scala
53+
- measure -- $PROG_HOME/dotty/tests/bench/tuple22-tails.scala
5454

5555
tuple22-apply:
56-
- measure $PROG_HOME/dotty/tests/bench/tuple22-apply.scala
56+
- measure -- $PROG_HOME/dotty/tests/bench/tuple22-apply.scala
5757

5858
tuple22-size:
59-
- measure $PROG_HOME/dotty/tests/bench/tuple22-size.scala
59+
- measure -- $PROG_HOME/dotty/tests/bench/tuple22-size.scala
6060

6161
tuple-reverse:
6262
- measure-run TupleOps.reverse

‎bench/profiles/typing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ charts:
88
scripts:
99

1010
find-ref:
11-
- measure $PROG_HOME/dotty/tests/bench/FindRef.scala
11+
- measure -- $PROG_HOME/dotty/tests/bench/FindRef.scala
1212

1313
config:
1414
pr_base_url: "https://github.com/lampepfl/dotty/pull/"

‎bench/scripts/collection-vector.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env bash
2-
sbt "dotty-bench-bootstrapped/jmh:run 40 40 3 bench/tests/Vector.scala"
2+
sbt "dotty-bench-bootstrapped/jmh:run -wi 40 -i 40 -f 3 -- bench/tests/Vector.scala"

‎bench/scripts/compiler-cold.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env bash
2-
find compiler/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run 0 1 10" {} + | sbt
2+
find compiler/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run -wi 0 -i 1 -f 10 -- " {} + | sbt

‎bench/scripts/compiler.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env bash
2-
find compiler/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run 5 10" {} + | sbt
2+
find compiler/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run -wi 5 -i 10 -- " {} + | sbt

‎bench/scripts/library-cold.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env bash
2-
find library/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run 0 1 10" {} + | sbt
2+
find library/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run -wi 0 -i 1 -f 10 -- " {} + | sbt

‎bench/scripts/library.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env bash
2-
find library/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run 40 30" {} + | sbt
2+
find library/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run -wi 40 -i 30 -- " {} + | sbt

0 commit comments

Comments
 (0)