Skip to content

Commit

Permalink
Merge branch 'release-3.4.1' into language-reference-stable
Browse files Browse the repository at this point in the history
  • Loading branch information
Kordyjan committed Mar 29, 2024
2 parents 18c69f6 + 3ffe322 commit 1205601
Show file tree
Hide file tree
Showing 1,240 changed files with 13,123 additions and 5,798 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
name: "\U0001F389 Suggest a feature"
about: Please create a feature request here https://github.com/lampepfl/dotty/discussions/new?category=feature-requests
about: Please create a feature request here https://github.com/scala/scala3/discussions/new?category=feature-requests
title: ''
labels: ''
assignees: ''

---

Please create a feature request in the [Dotty Discussions](https://github.com/lampepfl/dotty/discussions/new?category=feature-requests).
Please create a feature request in the [Dotty Discussions](https://github.com/scala/scala3/discussions/new?category=feature-requests).
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/improve-error.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ This code should be self-contained, reproducible (i.e. produces the expected err
Ideally, we should be able to just copy this code in a file and run `scalac` (and maybe `scala`) to reproduce the issue.
For a good example, see https://github.com/lampepfl/dotty/issues/18657
For a good example, see https://github.com/scala/scala3/issues/18657
-->

```Scala
Expand All @@ -44,12 +44,12 @@ for example:

## Why this Error/Warning was not helpful

<!-- For a good example, see https://github.com/lampepfl/dotty/issues/18657 -->
<!-- For a good example, see https://github.com/scala/scala3/issues/18657 -->

The message was unhelpful because...

## Suggested improvement

<!-- For a good example, see https://github.com/lampepfl/dotty/issues/18657 -->
<!-- For a good example, see https://github.com/scala/scala3/issues/18657 -->

It could be made more helpful by...
118 changes: 79 additions & 39 deletions .github/workflows/ci.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .github/workflows/lts-backport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
with:
fetch-depth: 0
- uses: coursier/cache-action@v6
- uses: VirtusLab/[email protected].0
- uses: VirtusLab/[email protected].2
- run: scala-cli ./project/scripts/addToBackportingProject.scala -- ${{ github.sha }}
env:
GRAPHQL_API_TOKEN: ${{ secrets.GRAPHQL_API_TOKEN }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ jobs:

steps:
- name: Reset existing repo
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
run: |
git config --global --add safe.directory /__w/dotty/dotty
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
- name: Cleanup
run: .github/workflows/cleanup.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scripts/publish-sdkman.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
set -u

# latest stable dotty version
DOTTY_VERSION=$(curl -s https://api.github.com/repos/lampepfl/dotty/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
DOTTY_URL="https://github.com/lampepfl/dotty/releases/download/$DOTTY_VERSION/scala3-$DOTTY_VERSION.zip"
DOTTY_VERSION=$(curl -s https://api.github.com/repos/scala/scala3/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
DOTTY_URL="https://github.com/scala/scala3/releases/download/$DOTTY_VERSION/scala3-$DOTTY_VERSION.zip"

# checking if dotty version is available
if ! curl --output /dev/null --silent --head --fail "$DOTTY_URL"; then
Expand Down
6 changes: 3 additions & 3 deletions MAINTENANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ The issue supervisor is responsible for:
- Modifying issue labels to best capture information about the issues
- Attempting to reproduce the issue (or label “stat:cannot reproduce”)
- Further minimizing the issue or asking the reporter of the issue to minimize it correctly (or label “stat:needs minimization”)
- Identifying which issues are of considerable importance and bringing them to the attention of the team during the Dotty meeting, where they can be filtered and added to the [Future Versions](https://github.com/lampepfl/dotty/milestone/46) milestone.
- Identifying which issues are of considerable importance and bringing them to the attention of the team during the Dotty meeting, where they can be filtered and added to the [Future Versions](https://github.com/scala/scala3/milestone/46) milestone.
- Identifying if a report is really a feature request and if so, converting it to
a [feature request discussion](https://github.com/lampepfl/dotty/discussions/categories/feature-requests).
a [feature request discussion](https://github.com/scala/scala3/discussions/categories/feature-requests).
- Keeping an eye on new
[discussions](https://github.com/lampepfl/dotty/discussions), making sure they
[discussions](https://github.com/scala/scala3/discussions), making sure they
don't go unanswered and also correctly labeling new feature requests.

Other core teammates are responsible for providing information to the issue supervisor in a timely manner when it is requested if they have that information.
Expand Down
6 changes: 3 additions & 3 deletions NOTICE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Dotty (https://dotty.epfl.ch)
Copyright 2012-2023 EPFL
Copyright 2012-2023 Lightbend, Inc.
Copyright 2012-2024 EPFL
Copyright 2012-2024 Lightbend, Inc.

Licensed under the Apache License, Version 2.0 (the "License"):
http://www.apache.org/licenses/LICENSE-2.0
Expand Down Expand Up @@ -104,4 +104,4 @@ major authors were omitted by oversight.
[3] https://github.com/sbt/sbt/tree/0.13/compile/interface/src/main/scala/xsbt
[4] https://github.com/scoverage/scalac-scoverage-plugin
[5] https://github.com/scalameta/metals
[6] https://github.com/lampepfl/dotty/pull/5783/files
[6] https://github.com/scala/scala3/pull/5783/files
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Dotty
=====
[![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amain)
[![Dotty CI](https://github.com/scala/scala3/workflows/Dotty/badge.svg?branch=master)](https://github.com/scala/scala3/actions?query=branch%3Amain)
[![Join the chat at https://discord.com/invite/scala](https://img.shields.io/discord/632150470000902164)](https://discord.com/invite/scala)

* [Documentation](https://docs.scala-lang.org/scala3/)
Expand All @@ -23,7 +23,7 @@ other more direct lines of communication such as email.
How to Contribute
=================
* [Getting Started as Contributor](https://docs.scala-lang.org/scala3/guides/contribution/contribution-intro.html)
* [Issues](https://github.com/lampepfl/dotty/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
* [Issues](https://github.com/scala/scala3/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)

License
=======
Expand Down
12 changes: 6 additions & 6 deletions bench/profiles/compiletime.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
charts:

- name: "Compile-time sums of constant integer types (generated)"
url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
url: https://github.com/scala/scala3/blob/main/bench/src/main/scala/generateBenchmarks.scala
lines:
- key: compiletime-sum-constants
label: bootstrapped

- name: "Compile-time sums of term reference types (generated)"
url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
url: https://github.com/scala/scala3/blob/main/bench/src/main/scala/generateBenchmarks.scala
lines:
- key: compiletime-sum-termrefs
label: bootstrapped

- name: "Sums of term references, result type inferred (generated)"
url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
url: https://github.com/scala/scala3/blob/main/bench/src/main/scala/generateBenchmarks.scala
lines:
- key: compiletime-sum-termrefs-terms
label: bootstrapped

- name: "Compile-time sums of type applications (generated)"
url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
url: https://github.com/scala/scala3/blob/main/bench/src/main/scala/generateBenchmarks.scala
lines:
- key: compiletime-sum-applications
label: bootstrapped

- name: "Compile-time additions inside multiplications (generated)"
url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
url: https://github.com/scala/scala3/blob/main/bench/src/main/scala/generateBenchmarks.scala
lines:
- key: compiletime-distribute
label: bootstrapped
Expand All @@ -48,4 +48,4 @@ scripts:
- measure 6 6 7 1 $PROG_HOME/dotty/bench/tests-generated/compiletime-ops/distribute.scala

config:
pr_base_url: "https://github.com/lampepfl/dotty/pull/"
pr_base_url: "https://github.com/scala/scala3/pull/"
2 changes: 1 addition & 1 deletion bench/profiles/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ includes:


config:
pr_base_url: "https://github.com/lampepfl/dotty/pull/"
pr_base_url: "https://github.com/scala/scala3/pull/"
8 changes: 4 additions & 4 deletions bench/profiles/empty.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
charts:

- name: "empty class"
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/empty-class.scala
url: https://github.com/scala/scala3/blob/main/tests/bench/empty-class.scala
lines:
- key: empty-class
label: bootstrapped

- name: "empty object"
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/empty-object.scala
url: https://github.com/scala/scala3/blob/main/tests/bench/empty-object.scala
lines:
- key: empty-object
label: bootstrapped

- name: "empty file"
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/empty-file.scala
url: https://github.com/scala/scala3/blob/main/tests/bench/empty-file.scala
lines:
- key: empty-file
label: bootstrapped
Expand All @@ -30,4 +30,4 @@ scripts:
- measure $PROG_HOME/dotty/tests/bench/empty-file.scala

config:
pr_base_url: "https://github.com/lampepfl/dotty/pull/"
pr_base_url: "https://github.com/scala/scala3/pull/"
20 changes: 10 additions & 10 deletions bench/profiles/exhaustivity.yml
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
charts:
- name: "exhaustivity check"
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/patmatexhaust.scala
url: https://github.com/scala/scala3/blob/main/tests/bench/patmatexhaust.scala
lines:
- key: patmatexhaust
label: bootstrapped

- name: "exhaustivity I"
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-I.scala
url: https://github.com/scala/scala3/blob/main/tests/bench/exhaustivity-I.scala
lines:
- key: exhaustivity-I
label: bootstrapped

- name: "exhaustivity S"
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-S.scala
url: https://github.com/scala/scala3/blob/main/tests/bench/exhaustivity-S.scala
lines:
- key: exhaustivity-S
label: bootstrapped

- name: "exhaustivity T"
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-T.scala
url: https://github.com/scala/scala3/blob/main/tests/bench/exhaustivity-T.scala
lines:
- key: exhaustivity-T
label: bootstrapped

- name: "exhaustivity V"
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-V.scala
url: https://github.com/scala/scala3/blob/main/tests/bench/exhaustivity-V.scala
lines:
- key: exhaustivity-V
label: bootstrapped

- name: "exhaustivity MIPS"
url: https://github.com/lampepfl/dotty/blob/main/tests/patmat/i7186.scala
url: https://github.com/scala/scala3/blob/main/tests/patmat/i7186.scala
lines:
- key: exhaustivity-mips
label: bootstrapped

- name: "exhaustivity i12241"
url: https://github.com/lampepfl/dotty/blob/main/tests/patmat/i12241.scala
url: https://github.com/scala/scala3/blob/main/tests/patmat/i12241.scala
lines:
- key: exhaustivity-i12241
label: bootstrapped

- name: "exhaustivity i12358"
url: https://github.com/lampepfl/dotty/blob/main/tests/patmat/i12358.scala
url: https://github.com/scala/scala3/blob/main/tests/patmat/i12358.scala
lines:
- key: exhaustivity-i12358
label: bootstrapped

- name: "exhaustivity i13565"
url: https://github.com/lampepfl/dotty/blob/main/tests/pos/i13565.scala
url: https://github.com/scala/scala3/blob/main/tests/pos/i13565.scala
lines:
- key: exhaustivity-i13565
label: bootstrapped
Expand Down Expand Up @@ -83,4 +83,4 @@ scripts:
- measure 20 40 3 $PROG_HOME/dotty/tests/pos/i13565.scala

config:
pr_base_url: "https://github.com/lampepfl/dotty/pull/"
pr_base_url: "https://github.com/scala/scala3/pull/"
10 changes: 5 additions & 5 deletions bench/profiles/implicits.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
charts:
- name: "implicit cache I"
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/implicit_cache.scala
url: https://github.com/scala/scala3/blob/main/tests/bench/implicit_cache.scala
lines:
- key: implicit-cache
label: bootstrapped
- key: implicit-cache-from-tasty
label: from tasty

- name: "implicit cache II"
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/implicitNums.scala
url: https://github.com/scala/scala3/blob/main/tests/bench/implicitNums.scala
lines:
- key: implicitNums
label: bootstrapped
- key: implicitNums-from-tasty
label: from tasty

- name: "implicit scope loop"
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/implicit-scope-loop.scala
url: https://github.com/scala/scala3/blob/main/tests/bench/implicit-scope-loop.scala
lines:
- key: implicit-scope-loop
label: bootstrapped

- name: "inductive implicits"
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/inductive-implicits.scala
url: https://github.com/scala/scala3/blob/main/tests/bench/inductive-implicits.scala
lines:
- key: inductive-implicits
label: bootstrapped
Expand All @@ -48,4 +48,4 @@ scripts:
- source $PROG_HOME/dotty/bench/scripts/implicitNums-from-tasty

config:
pr_base_url: "https://github.com/lampepfl/dotty/pull/"
pr_base_url: "https://github.com/scala/scala3/pull/"
4 changes: 2 additions & 2 deletions bench/profiles/misc.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
charts:

- name: "issue #1535"
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/i1535.scala
url: https://github.com/scala/scala3/blob/main/tests/bench/i1535.scala
lines:
- key: i1535
label: bootstrapped

- name: "issue #1687"
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/i1687.scala
url: https://github.com/scala/scala3/blob/main/tests/bench/i1687.scala
lines:
- key: i1687
label: bootstrapped
Expand Down
2 changes: 1 addition & 1 deletion bench/profiles/projects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ scripts:
- source $PROG_HOME/dotty/bench/scripts/stdlib213

config:
pr_base_url: "https://github.com/lampepfl/dotty/pull/"
pr_base_url: "https://github.com/scala/scala3/pull/"
2 changes: 1 addition & 1 deletion bench/profiles/pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ includes:
- empty.yml

config:
pr_base_url: "https://github.com/lampepfl/dotty/pull/"
pr_base_url: "https://github.com/scala/scala3/pull/"
8 changes: 4 additions & 4 deletions bench/profiles/quotes.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
charts:
- name: "Inline a quote"
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/power-macro/PowerInlined-1.scala
url: https://github.com/scala/scala3/blob/main/tests/bench/power-macro/PowerInlined-1.scala
lines:
- key: power-macro-power-inlined-1
label: bootstrapped

- name: "Inline 1k quotes"
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/power-macro/PowerInlined-1k.scala
url: https://github.com/scala/scala3/blob/main/tests/bench/power-macro/PowerInlined-1k.scala
lines:
- key: power-macro-power-inlined-1k
label: bootstrapped

- name: "Quote String interpolation matching"
url: https://github.com/lampepfl/dotty/blob/main/tests/bench/string-interpolation-macro/Test.scala
url: https://github.com/scala/scala3/blob/main/tests/bench/string-interpolation-macro/Test.scala
lines:
- key: quote-string-interpolation-matching
label: bootstrapped
Expand All @@ -29,4 +29,4 @@ scripts:
- source $PROG_HOME/dotty/bench/scripts/quote-string-interpolation-matching

config:
pr_base_url: "https://github.com/lampepfl/dotty/pull/"
pr_base_url: "https://github.com/scala/scala3/pull/"
2 changes: 1 addition & 1 deletion bench/profiles/sbt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ scripts:
- measure -with-compiler -Yforce-sbt-phases -with-dotty $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java)

config:
pr_base_url: "https://github.com/lampepfl/dotty/pull/"
pr_base_url: "https://github.com/scala/scala3/pull/"
Loading

0 comments on commit 1205601

Please sign in to comment.