Skip to content

Commit b28b425

Browse files
committed
Merge branch 'main' into export-diagnostics
2 parents 71a5cd0 + 55c5864 commit b28b425

File tree

229 files changed

+5166
-1580
lines changed

Some content is hidden

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

229 files changed

+5166
-1580
lines changed
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
---
2+
name: "\U0001F615 Error/Warning message report"
3+
about: Report an error/warning message that was confusing/unhelpful
4+
title: ''
5+
labels: itype:enhancement, area:reporting, better-errors, stat:needs triage
6+
assignees: ''
7+
8+
---
9+
10+
## Compiler version
11+
12+
If you're not sure what version you're using, run `print scalaVersion` from sbt
13+
(if you're running scalac manually, use `scalac -version` instead).
14+
15+
## Minimized example
16+
17+
<!--
18+
This code should be self-contained, reproducible (i.e. produces the expected error/warning message) 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+
For a good example, see https://github.com/lampepfl/dotty/issues/18657
23+
-->
24+
25+
```Scala
26+
printl("hello, world")
27+
```
28+
29+
## Output Error/Warning message
30+
31+
<!--
32+
Here, please provide the produced error/warning message that is confusing/unhelpful, etc.
33+
34+
for example:
35+
-->
36+
37+
```scala
38+
-- [E006] Not Found Error: ----------------
39+
1 |printl("hello, world")
40+
|^^^^^^
41+
|Not found: printl
42+
1 error found
43+
```
44+
45+
## Why this Error/Warning was not helpful
46+
47+
<!-- For a good example, see https://github.com/lampepfl/dotty/issues/18657 -->
48+
49+
The message was unhelpful because...
50+
51+
## Suggested improvement
52+
53+
<!-- For a good example, see https://github.com/lampepfl/dotty/issues/18657 -->
54+
55+
It could be made more helpful by...

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134

135135
- name: Cmd Tests
136136
run: |
137-
./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped-tasty-tests/run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
137+
./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;scala2-library-tasty-tests/run ;scala2-library-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
138138
./project/scripts/cmdTests
139139
./project/scripts/bootstrappedOnlyCmdTests
140140
@@ -253,12 +253,12 @@ jobs:
253253

254254
- name: MiMa
255255
run: |
256-
./project/scripts/sbt ";scala3-interfaces/mimaReportBinaryIssues ;scala3-library-bootstrapped/mimaReportBinaryIssues ;scala3-library-bootstrappedJS/mimaReportBinaryIssues; tasty-core-bootstrapped/mimaReportBinaryIssues; stdlib-bootstrapped/mimaReportBinaryIssues"
256+
./project/scripts/sbt ";scala3-interfaces/mimaReportBinaryIssues ;scala3-library-bootstrapped/mimaReportBinaryIssues ;scala3-library-bootstrappedJS/mimaReportBinaryIssues; tasty-core-bootstrapped/mimaReportBinaryIssues; scala2-library-bootstrapped/mimaReportBinaryIssues"
257257
258258
- name: TASTy MiMa
259259
run: |
260260
# This script cleans the compiler and recompiles it from scratch (keep as last run)
261-
./project/scripts/stdlib-bootstrapped-tasty-mima.sh
261+
./project/scripts/scala2-library-tasty-mima.sh
262262
263263
community_build_a:
264264
runs-on: [self-hosted, Linux]
@@ -493,7 +493,7 @@ jobs:
493493

494494
- name: Test
495495
run: |
496-
./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped-tasty-tests/run ;stdlib-bootstrapped-tasty-tests/test"
496+
./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;scala2-library-tasty-tests/run ;scala2-library-tasty-tests/test"
497497
./project/scripts/cmdTests
498498
./project/scripts/bootstrappedOnlyCmdTests
499499

.github/workflows/spec.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: Specification
2+
3+
on:
4+
push:
5+
tags:
6+
- '*'
7+
branches-ignore:
8+
- 'gh-readonly-queue/**'
9+
pull_request:
10+
merge_group:
11+
workflow_dispatch:
12+
13+
env:
14+
DOTTY_CI_RUN: true
15+
16+
jobs:
17+
specification:
18+
runs-on: ubuntu-latest
19+
defaults:
20+
run:
21+
working-directory: ./docs/_spec
22+
23+
steps:
24+
- uses: actions/checkout@v3
25+
26+
# Keep in sync with ./docs/_spec/Dockerfile
27+
- uses: ruby/setup-ruby@v1
28+
with:
29+
ruby-version: '2.7'
30+
- name: Install required gems
31+
run: |
32+
gem update --system
33+
gem install sass-embedded -v 1.58.0
34+
gem install bundler:1.17.2 jekyll
35+
bundle install
36+
npm install bower
37+
38+
- name: Build the specification
39+
run: |
40+
bundle exec jekyll build
41+
42+
# Deploy
43+
- name: Deployment
44+
env:
45+
USER_FOR_TEST: ${{ secrets.SPEC_DEPLOY_USER }}
46+
if: ${{ env.USER_FOR_TEST != '' }}
47+
uses: burnett01/rsync-deployments@6.0.0
48+
with:
49+
switches: -rzv
50+
path: docs/_spec/_site/
51+
remote_path: ${{ secrets.SPEC_DEPLOY_PATH }}
52+
remote_host: ${{ secrets.SPEC_DEPLOY_HOST }}
53+
remote_user: ${{ secrets.SPEC_DEPLOY_USER }}
54+
remote_key: ${{ secrets.SPEC_DEPLOY_KEY }}
55+
remote_key_pass: ${{ secrets.SPEC_DEPLOY_PASS }}

bench-run/src/main/scala/dotty/tools/benchmarks/Main.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ object Bench {
6868
println()
6969
println("Usage:")
7070
println()
71-
println("dotty-bench-run/jmh:run [<warmup>] [<iterations>] [<forks>] <regexp> [<input>|--] [<output>]")
71+
println("scala3-bench-run/jmh:run [<warmup>] [<iterations>] [<forks>] <regexp> [<input>|--] [<output>]")
7272
println()
7373
println("warmup: warmup iterations. defaults to 20.")
7474
println("iterations: benchmark iterations. defaults to 20.")

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 "scala3-bench-bootstrapped/jmh:run 40 40 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 "scala3-bench-bootstrapped/jmh:run 0 1 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 "scala3-bench-bootstrapped/jmh:run 5 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 "scala3-bench-bootstrapped/jmh:run 0 1 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 "scala3-bench-bootstrapped/jmh:run 40 30" {} + | sbt

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ val `scala3-language-server` = Build.`scala3-language-server`
1414
val `scala3-bench` = Build.`scala3-bench`
1515
val `scala3-bench-bootstrapped` = Build.`scala3-bench-bootstrapped`
1616
val `scala3-bench-micro` = Build.`scala3-bench-micro`
17-
val `stdlib-bootstrapped` = Build.`stdlib-bootstrapped`
18-
val `stdlib-bootstrapped-tasty` = Build.`stdlib-bootstrapped-tasty`
19-
val `stdlib-bootstrapped-tasty-tests` = Build.`stdlib-bootstrapped-tasty-tests`
17+
val `scala2-library-bootstrapped` = Build.`scala2-library-bootstrapped`
18+
val `scala2-library-tasty` = Build.`scala2-library-tasty`
19+
val `scala2-library-tasty-tests` = Build.`scala2-library-tasty-tests`
2020
val `tasty-core` = Build.`tasty-core`
2121
val `tasty-core-bootstrapped` = Build.`tasty-core-bootstrapped`
2222
val `tasty-core-scala2` = Build.`tasty-core-scala2`
Submodule stdLib213 updated 489 files

0 commit comments

Comments
 (0)