Merge remote-tracking branch 'upstream/master' into topic/http4s

Author: armanbilge

.github/ISSUE_TEMPLATE/bug.md

@@ -2,7 +2,7 @@
 name: "\U0001F41B Bug report"
 about: Report a bug about the Dotty Compiler
 title: ''
-labels: itype:bug
+labels: itype:bug, stat:needs triage
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/crash.md

@@ -2,7 +2,7 @@
 name: "\U0001F4A5 Crash report"
 about: Report a Dotty compiler crash
 title: ''
-labels: itype:bug, itype:crash
+labels: itype:bug, itype:crash, stat:needs triage
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/other-issue.md

@@ -1,9 +1,10 @@
 ---
-name: "Other issue"
+name: Other issue
 about: Report an issue about the Dotty Compiler (not bug or crash)
 title: ''
-labels:
+labels: stat:needs triage
 assignees: ''
+
 ---
 
 ## Compiler version

.github/ISSUE_TEMPLATE/syntax-highlight.md

@@ -1,6 +1,6 @@
 ---
 name: Syntax highlighting
-about: ''
+about: Please create a syntax highlighting issue in a respective repo
 title: ''
 labels: ''
 assignees: ''
@@ -10,4 +10,4 @@ assignees: ''
 Please create a syntax highlighting issue here
 * VS Code / GitHub: https://github.com/scala/vscode-scala-syntax/issues
 * IntelliJ: https://youtrack.jetbrains.com/issues/SCL?q=tag:%20%7BScala%203%7D%20tag:%20%7BSyntax%20Highlighting%7D
-* highlight.js: https://github.com/highlightjs/highlight.js/issues
+* highlight.js: https://github.com/highlightjs/highlight.js/issues

.github/workflows/ci.yaml

@@ -66,7 +66,7 @@ jobs:
 
       - name: Test
         run: |
-          ./project/scripts/sbt ";compile ;test"
+          ./project/scripts/sbt ";dist/pack; compile ;test"
           ./project/scripts/cmdTests
 
   test:
@@ -111,7 +111,7 @@ jobs:
 
       - name: Cmd Tests
         run: |
-          ./project/scripts/sbt ";scala3-bootstrapped/compile; scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
+          ./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
           ./project/scripts/bootstrapCmdTests
 
       - name: MiMa
@@ -181,7 +181,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Test
-        run: sbt ";scala3-bootstrapped/compile ;scala3-bootstrapped/test"
+        run: sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test"
         shell: cmd
 
       - name: Scala.js Test
@@ -317,6 +317,49 @@ jobs:
           git submodule update --init --recursive --jobs 7
           ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"
 
+  community_build_forward_compat:
+    runs-on: [self-hosted, Linux]
+    container:
+      image: lampepfl/dotty:2021-03-22
+      options: --cpu-shares 4096
+      volumes:
+        - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
+        - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
+        - ${{ github.workspace }}/../../cache/general:/root/.cache
+    if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
+        || (
+           github.event_name == 'pull_request'
+           && !contains(github.event.pull_request.body, '[skip ci]')
+           && !contains(github.event.pull_request.body, '[skip community_build]')
+           && contains(github.event.pull_request.body, '[test_forward_compat]')
+         )
+         || (
+           github.event_name == 'workflow_dispatch'
+           && github.repository == 'lampepfl/dotty'
+         )"
+
+    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
+
+      - name: Checkout cleanup script
+        uses: actions/checkout@v2
+
+      - name: Cleanup
+        run: .github/workflows/cleanup.sh
+
+      - name: Git Checkout
+        uses: actions/checkout@v2
+
+      - name: Add SBT proxy repositories
+        run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
+
+      - name: Test
+        run: |
+          git submodule sync
+          git submodule update --init --recursive --jobs 7
+          ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestForwardCompat"
+
   test_sbt:
     runs-on: [self-hosted, Linux]
     container:
@@ -403,7 +446,7 @@ jobs:
 
       - name: Test
         run: |
-          ./project/scripts/sbt ";scala3-bootstrapped/compile ;scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test"
+          ./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test"
           ./project/scripts/bootstrapCmdTests
 
   publish_nightly:
@@ -415,7 +458,7 @@ jobs:
         - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
         - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
         - ${{ github.workspace }}/../../cache/general:/root/.cache
-    needs: [test_non_bootstrapped, test, community_build_a, community_build_b, community_build_c, test_sbt, test_java8]
+    needs: [test_non_bootstrapped, test, community_build_a, community_build_b, community_build_c, community_build_forward_compat, test_sbt, test_java8]
     if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
     env:
       NIGHTLYBUILD: yes
@@ -473,7 +516,8 @@ jobs:
       DOTTY_WEBSITE_BOT_TOKEN: ${{ secrets.BOT_TOKEN }}  # If you need to change this:
                                           # Generate one at https://github.com/settings/tokens
                                           # Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website
-      DOCS_SCALALANG_BOT_TOKEN: ${{ secrets.DOCS_SCALALANG_BOT_TOKEN }}  # If you need to change this:
+      # Currently unused token, no need to deploy anything to docs.scala-lang
+      # DOCS_SCALALANG_BOT_TOKEN: ${{ secrets.DOCS_SCALALANG_BOT_TOKEN }}  # If you need to change this:
                                           # Generate one at https://github.com/settings/tokens
                                           # Make sure you have the write permissions to the repo: https://github.com/scala/docs.scala-lang
 

.gitignore

@@ -58,6 +58,9 @@ tests/partest-generated/
 tests/locks/
 /test-classes/
 
+# Benchmarks
+bench/tests-generated
+
 # Ignore output files but keep the directory
 out/
 build/
@@ -103,9 +106,6 @@ cs
 # Coursier test product
 compiler/test-coursier/run/*.jar
 
-# Docs
-docs-for-dotty-page/*
-
-# docs.scala-lang deplyment temp dir
-docsScalaLang/
-docs/_site/
+# docs related
+contributors.js
+content-contributors.css

.gitmodules

@@ -222,3 +222,34 @@
 [submodule "community-build/community-projects/http4s"]
 	path = community-build/community-projects/http4s
 	url = https://github.com/http4s/http4s.git
+[submodule "community-build/community-projects/munit-forward-compat"]
+	path = community-build/community-projects/munit-forward-compat
+	url = https://github.com/dotty-staging/munit.git
+[submodule "community-build/community-projects/discipline-forward-compat"]
+	path = community-build/community-projects/discipline-forward-compat
+	url = https://github.com/dotty-staging/discipline.git
+[submodule "community-build/community-projects/discipline-munit-forward-compat"]
+	path = community-build/community-projects/discipline-munit-forward-compat
+	url = https://github.com/dotty-staging/discipline-munit.git
+[submodule "community-build/community-projects/discipline-specs2-forward-compat"]
+	path = community-build/community-projects/discipline-specs2-forward-compat
+	url = https://github.com/dotty-staging/discipline-specs2.git
+[submodule "community-build/community-projects/simulacrum-scalafix-forward-compat"]
+	path = community-build/community-projects/simulacrum-scalafix-forward-compat
+	url = https://github.com/dotty-staging/simulacrum-scalafix.git
+[submodule "community-build/community-projects/cats-forward-compat"]
+	path = community-build/community-projects/cats-forward-compat
+	url = https://github.com/dotty-staging/cats.git
+[submodule "community-build/community-projects/cats-mtl-forward-compat"]
+	path = community-build/community-projects/cats-mtl-forward-compat
+	url = https://github.com/dotty-staging/cats-mtl.git
+[submodule "community-build/community-projects/coop-forward-compat"]
+	path = community-build/community-projects/coop-forward-compat
+	url = https://github.com/dotty-staging/coop.git
+[submodule "community-build/community-projects/cats-effect-3-forward-compat"]
+	path = community-build/community-projects/cats-effect-3-forward-compat
+	url = https://github.com/dotty-staging/cats-effect.git
+	branch = series/3.x
+[submodule "community-build/community-projects/scalacheck-forward-compat"]
+	path = community-build/community-projects/scalacheck-forward-compat
+	url = https://github.com/dotty-staging/scalacheck

CONTRIBUTING.md

@@ -6,7 +6,7 @@ These guidelines are meant to be a living document that should be changed and ad
 
 This is the process for committing code to the Scala project. There are of course exceptions to these rules, for example minor changes to comments and documentation, fixing a broken build etc.
 
-1. Make sure you have signed the [Scala CLA](http://typesafe.com/contribute/cla/scala), if not, sign it.
+1. Make sure you have signed the [Scala CLA](https://www.lightbend.com/contribute/cla/scala), if not, sign it.
 2. Before starting to work on a feature or a fix, it's good practice to ensure that:
     1. There is a ticket for your work in the project's [issue tracker](https://github.com/lampepfl/dotty/issues);
     2. The ticket has been discussed and prioritized by the team.

README.md

@@ -1,7 +1,7 @@
 Dotty
 =====
 [![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amaster)
-[![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)
+[![Join the chat at https://discord.com/invite/scala](https://img.shields.io/discord/632150470000902164)](https://img.shields.io/discord/632150470000902164)
 
 * [Homepage](https://dotty.epfl.ch)
 * [Documentation](https://dotty.epfl.ch/docs)
@@ -18,7 +18,7 @@ Building a Local Distribution
 Code of Conduct
 ===============
 Dotty uses the [Scala Code of Conduct](https://www.scala-lang.org/conduct.html)
-for all communication and discussion. This includes both GitHub, Gitter chat and
+for all communication and discussion. This includes both GitHub, Discord and
 other more direct lines of communication such as email.
 
 How to Contribute

bench/profiles/ci.yml

@@ -1,55 +1,55 @@
 scripts:
 
     re2s:
-        - measure -wi 1 -i 1 -f 1 -- $(find $PROG_HOME/tests/re2s/src -name *.scala)
+        - measure 1 1 1 $(find $PROG_HOME/tests/re2s/src -name *.scala)
 
     implicit-cache:
-        - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/implicit_cache.scala
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/implicit_cache.scala
 
     implicit-cache-from-tasty:
         - source $PROG_HOME/dotty/bench/scripts/implicit-cache-from-tasty
 
     implicit-scope-loop:
-        - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/implicit-scope-loop.scala
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/implicit-scope-loop.scala
 
     i1535:
-        - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/i1535.scala
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/i1535.scala
 
     i1687:
-        - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/i1687.scala
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/i1687.scala
 
     empty-class:
-        - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/empty-class.scala
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/empty-class.scala
 
     empty-object:
-        - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/empty-object.scala
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/empty-object.scala
 
     empty-file:
-        - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/empty-file.scala
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/empty-file.scala
 
     patmatexhaust:
-        - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/patmatexhaust.scala
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/patmatexhaust.scala
 
     exhaustivity-I:
-        - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/exhaustivity-I.scala
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-I.scala
 
     exhaustivity-S:
-        - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/exhaustivity-S.scala
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-S.scala
 
     exhaustivity-T:
-        - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/exhaustivity-T.scala
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-T.scala
 
     exhaustivity-V:
-        - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/exhaustivity-V.scala
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-V.scala
 
     implicitNums:
-        - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/implicitNums.scala
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/implicitNums.scala
 
     implicitNums-from-tasty:
         - source $PROG_HOME/dotty/bench/scripts/implicitNums-from-tasty
 
     inductive-implicits:
-        - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/inductive-implicits.scala
+        - measure 1 1 1 $PROG_HOME/dotty/tests/bench/inductive-implicits.scala
 
     scalap:
         - source $PROG_HOME/dotty/bench/scripts/scalap

bench/profiles/compiletime.yml

@@ -0,0 +1,51 @@
+charts:
+
+    - name: "Compile-time sums of constant integer types (generated)"
+      url: https://github.com/lampepfl/dotty/blob/master/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/master/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/master/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/master/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/master/bench/src/main/scala/generateBenchmarks.scala
+      lines:
+        - key: compiletime-distribute
+          label: bootstrapped
+
+scripts:
+
+    compiletime-sum-constants:
+        - measure 6 6 7 1 $PROG_HOME/dotty/bench/tests-generated/compiletime-ops/sum-constants.scala
+
+    compiletime-sum-termrefs:
+        - measure 6 6 7 1 $PROG_HOME/dotty/bench/tests-generated/compiletime-ops/sum-termrefs.scala
+
+    compiletime-sum-termrefs-terms:
+        - measure 6 6 7 1 $PROG_HOME/dotty/bench/tests-generated/compiletime-ops/sum-termrefs-terms.scala
+
+    compiletime-sum-applications:
+        - measure 6 6 7 1 $PROG_HOME/dotty/bench/tests-generated/compiletime-ops/sum-applications.scala
+
+    compiletime-distribute:
+        - 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/"

bench/profiles/default.yml

@@ -7,6 +7,7 @@ includes:
     - empty.yml
     - quotes.yml
     - tuples.yml
+    - compiletime.yml
 
 
 config:

bench/profiles/empty.yml

@@ -21,13 +21,13 @@ charts:
 scripts:
 
     empty-class:
-        - measure -- $PROG_HOME/dotty/tests/bench/empty-class.scala
+        - measure $PROG_HOME/dotty/tests/bench/empty-class.scala
 
     empty-object:
-        - measure -- $PROG_HOME/dotty/tests/bench/empty-object.scala
+        - measure $PROG_HOME/dotty/tests/bench/empty-object.scala
 
     empty-file:
-        - measure -- $PROG_HOME/dotty/tests/bench/empty-file.scala
+        - measure $PROG_HOME/dotty/tests/bench/empty-file.scala
 
 config:
     pr_base_url: "https://github.com/lampepfl/dotty/pull/"