diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 405225011cdd..2847bfd578b9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -122,7 +122,7 @@ jobs: runs-on: [self-hosted, Windows] if: "( github.event_name == 'push' - && github.ref != 'refs/heads/master' + && github.ref != 'refs/heads/main' ) || ( github.event_name == 'pull_request' diff --git a/.github/workflows/scaladoc.yaml b/.github/workflows/scaladoc.yaml index 080b77fcb054..50c8009f3e8e 100644 --- a/.github/workflows/scaladoc.yaml +++ b/.github/workflows/scaladoc.yaml @@ -13,7 +13,7 @@ jobs: && !contains(github.event.pull_request.body, '[skip docs]') ) || contains(github.event.ref, 'scaladoc') - || contains(github.event.ref, 'master')" + || contains(github.event.ref, 'main')" steps: - name: Git Checkout @@ -82,7 +82,7 @@ jobs: ) || contains(github.event.ref, 'scaladoc') || contains(github.event.ref, 'scala3doc') - || contains(github.event.ref, 'master'))" + || contains(github.event.ref, 'main'))" steps: - name: Git Checkout diff --git a/README.md b/README.md index 991d6842acdc..fa564654fb38 100644 --- a/README.md +++ b/README.md @@ -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%3Amaster) +[![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amain) [![Join the chat at https://discord.com/invite/scala](https://img.shields.io/discord/632150470000902164)](https://discord.com/invite/scala) * [Homepage](https://dotty.epfl.ch) diff --git a/bench/profiles/compiletime.yml b/bench/profiles/compiletime.yml index df85424c8f56..fd77df7dfe9a 100644 --- a/bench/profiles/compiletime.yml +++ b/bench/profiles/compiletime.yml @@ -1,31 +1,31 @@ charts: - name: "Compile-time sums of constant integer types (generated)" - url: https://github.com/lampepfl/dotty/blob/master/bench/src/main/scala/generateBenchmarks.scala + url: https://github.com/lampepfl/dotty/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/master/bench/src/main/scala/generateBenchmarks.scala + url: https://github.com/lampepfl/dotty/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/master/bench/src/main/scala/generateBenchmarks.scala + url: https://github.com/lampepfl/dotty/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/master/bench/src/main/scala/generateBenchmarks.scala + url: https://github.com/lampepfl/dotty/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/master/bench/src/main/scala/generateBenchmarks.scala + url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala lines: - key: compiletime-distribute label: bootstrapped diff --git a/bench/profiles/empty.yml b/bench/profiles/empty.yml index ef878e07f50d..ac571e64e831 100644 --- a/bench/profiles/empty.yml +++ b/bench/profiles/empty.yml @@ -1,19 +1,19 @@ charts: - name: "empty class" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/empty-class.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/empty-class.scala lines: - key: empty-class label: bootstrapped - name: "empty object" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/empty-object.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/empty-object.scala lines: - key: empty-object label: bootstrapped - name: "empty file" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/empty-file.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/empty-file.scala lines: - key: empty-file label: bootstrapped diff --git a/bench/profiles/exhaustivity.yml b/bench/profiles/exhaustivity.yml index 1dd4f78c5aa8..af6eb4041f6c 100644 --- a/bench/profiles/exhaustivity.yml +++ b/bench/profiles/exhaustivity.yml @@ -1,54 +1,54 @@ charts: - name: "exhaustivity check" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/patmatexhaust.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/patmatexhaust.scala lines: - key: patmatexhaust label: bootstrapped - name: "exhaustivity I" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/exhaustivity-I.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-I.scala lines: - key: exhaustivity-I label: bootstrapped - name: "exhaustivity S" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/exhaustivity-S.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-S.scala lines: - key: exhaustivity-S label: bootstrapped - name: "exhaustivity T" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/exhaustivity-T.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-T.scala lines: - key: exhaustivity-T label: bootstrapped - name: "exhaustivity V" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/exhaustivity-V.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-V.scala lines: - key: exhaustivity-V label: bootstrapped - name: "exhaustivity MIPS" - url: https://github.com/lampepfl/dotty/blob/master/tests/patmat/i7186.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/patmat/i7186.scala lines: - key: exhaustivity-mips label: bootstrapped - name: "exhaustivity i12241" - url: https://github.com/lampepfl/dotty/blob/master/tests/patmat/i12241.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/patmat/i12241.scala lines: - key: exhaustivity-i12241 label: bootstrapped - name: "exhaustivity i12358" - url: https://github.com/lampepfl/dotty/blob/master/tests/patmat/i12358.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/patmat/i12358.scala lines: - key: exhaustivity-i12358 label: bootstrapped - name: "exhaustivity i13565" - url: https://github.com/lampepfl/dotty/blob/master/tests/pos/i13565.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/pos/i13565.scala lines: - key: exhaustivity-i13565 label: bootstrapped diff --git a/bench/profiles/implicits.yml b/bench/profiles/implicits.yml index d20a99c26461..3e944b5be28b 100644 --- a/bench/profiles/implicits.yml +++ b/bench/profiles/implicits.yml @@ -1,6 +1,6 @@ charts: - name: "implicit cache I" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/implicit_cache.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/implicit_cache.scala lines: - key: implicit-cache label: bootstrapped @@ -8,7 +8,7 @@ charts: label: from tasty - name: "implicit cache II" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/implicitNums.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/implicitNums.scala lines: - key: implicitNums label: bootstrapped @@ -16,13 +16,13 @@ charts: label: from tasty - name: "implicit scope loop" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/implicit-scope-loop.scala + url: https://github.com/lampepfl/dotty/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/master/tests/bench/inductive-implicits.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/inductive-implicits.scala lines: - key: inductive-implicits label: bootstrapped diff --git a/bench/profiles/misc.yml b/bench/profiles/misc.yml index 80172fc791ed..668f8e60c176 100644 --- a/bench/profiles/misc.yml +++ b/bench/profiles/misc.yml @@ -1,13 +1,13 @@ charts: - name: "issue #1535" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/i1535.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/i1535.scala lines: - key: i1535 label: bootstrapped - name: "issue #1687" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/i1687.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/i1687.scala lines: - key: i1687 label: bootstrapped diff --git a/bench/profiles/projects.yml b/bench/profiles/projects.yml index 2d96fb732910..e012d36b0b01 100644 --- a/bench/profiles/projects.yml +++ b/bench/profiles/projects.yml @@ -18,7 +18,7 @@ charts: label: bootstrapped - name: re2 - url: https://github.com/lampepfl/bench/blob/master/tests/re2s + url: https://github.com/lampepfl/bench/blob/main/tests/re2s lines: - key: re2s label: bootstrapped diff --git a/bench/profiles/quotes.yml b/bench/profiles/quotes.yml index 9cb0d44e2304..afd970543aa1 100644 --- a/bench/profiles/quotes.yml +++ b/bench/profiles/quotes.yml @@ -1,18 +1,18 @@ charts: - name: "Inline a quote" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/power-macro/PowerInlined-1.scala + url: https://github.com/lampepfl/dotty/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/master/tests/bench/power-macro/PowerInlined-1k.scala + url: https://github.com/lampepfl/dotty/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/master/tests/bench/string-interpolation-macro/Test.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/string-interpolation-macro/Test.scala lines: - key: quote-string-interpolation-matching label: bootstrapped diff --git a/bench/profiles/tuples.yml b/bench/profiles/tuples.yml index eaa2f302a885..5e41ecf7c80d 100644 --- a/bench/profiles/tuples.yml +++ b/bench/profiles/tuples.yml @@ -1,42 +1,42 @@ charts: - name: "Tuple22 creation with Tuple22.apply" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/tuple22-creation-apply.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/tuple22-creation-apply.scala lines: - key: tuple22-creation-apply label: bootstrapped - name: "Tuple22 creation with *:" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/tuple22-creation-cons.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/tuple22-creation-cons.scala lines: - key: tuple22-creation-cons label: bootstrapped - name: "Tuple22.tail" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/tuple22-tails.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/tuple22-tails.scala lines: - key: tuple22-tails label: bootstrapped - name: "Tuple22.apply" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/tuple22-apply.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/tuple22-apply.scala lines: - key: tuple22-apply label: bootstrapped - name: "Tuple22.size" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/tuple22-size.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/tuple22-size.scala lines: - key: tuple22-size label: bootstrapped - name: "Tuple reverse (Runtime)" - url: https://github.com/lampepfl/dotty/blob/master/bench-run/src/main/scala/dotty/tools/benchmarks/tuples/TupleOps.scala#L59 + url: https://github.com/lampepfl/dotty/blob/main/bench-run/src/main/scala/dotty/tools/benchmarks/tuples/TupleOps.scala#L59 lines: - key: tuple-reverse label: bootstrapped - name: "Tuple flatMap (Runtime)" - url: https://github.com/lampepfl/dotty/blob/master/bench-run/src/main/scala/dotty/tools/benchmarks/tuples/TupleOps.scala#L64 + url: https://github.com/lampepfl/dotty/blob/main/bench-run/src/main/scala/dotty/tools/benchmarks/tuples/TupleOps.scala#L64 lines: - key: tuple-flatMap label: bootstrapped diff --git a/bench/profiles/typing.yml b/bench/profiles/typing.yml index 4df33da49d32..f6476bca7006 100644 --- a/bench/profiles/typing.yml +++ b/bench/profiles/typing.yml @@ -1,6 +1,6 @@ charts: - name: "Find Ref" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/FindRef.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/FindRef.scala lines: - key: find-ref label: bootstrapped diff --git a/docs/blog/_posts/2019-06-11-16th-dotty-milestone-release.md b/docs/blog/_posts/2019-06-11-16th-dotty-milestone-release.md index e3d81f6c3df5..41194df26625 100644 --- a/docs/blog/_posts/2019-06-11-16th-dotty-milestone-release.md +++ b/docs/blog/_posts/2019-06-11-16th-dotty-milestone-release.md @@ -156,7 +156,7 @@ enum B(val gravity: Double) extends java.lang.Enum[B] { } ``` -For more information please check the [test case](https://github.com/lampepfl/dotty/tree/master/tests/run/enum-java) and +For more information please check the [test case](https://github.com/lampepfl/dotty/tree/main/tests/run/enum-java) and also the relevant PRs [#6602](https://github.com/lampepfl/dotty/pull/6602) and [#6629](https://github.com/lampepfl/dotty/pull/6629). diff --git a/docs/blog/_posts/2019-12-20-21th-dotty-milestone-release.md b/docs/blog/_posts/2019-12-20-21th-dotty-milestone-release.md index 6b5d28c35254..94d8ee61bec9 100644 --- a/docs/blog/_posts/2019-12-20-21th-dotty-milestone-release.md +++ b/docs/blog/_posts/2019-12-20-21th-dotty-milestone-release.md @@ -48,7 +48,7 @@ It means that we can now put the Scala 3 compiler under heavy load, getting it ready for industrial strength applications. At the moment we have 23 projects on our community projects and we expect this number to go up! -> https://github.com/lampepfl/dotty/tree/master/community-build/community-projects +> https://github.com/lampepfl/dotty/tree/main/community-build/community-projects This project contains tests to build and test a corpus of open sources Scala 2.x projects against Scala 3. diff --git a/docs/blog/_posts/2020-04-29-24th-dotty-milestone-release.md b/docs/blog/_posts/2020-04-29-24th-dotty-milestone-release.md index d4f34446e5c4..e32df8cacc55 100644 --- a/docs/blog/_posts/2020-04-29-24th-dotty-milestone-release.md +++ b/docs/blog/_posts/2020-04-29-24th-dotty-milestone-release.md @@ -134,7 +134,7 @@ We are looking forward to having you join the team of contributors. Dotty now has a set of widely-used community libraries that are built against every nightly Dotty snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants. -Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build) +Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build) to make sure that our regression suite includes your library. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/blog/_posts/2020-06-22-25th-dotty-milestone-release.md b/docs/blog/_posts/2020-06-22-25th-dotty-milestone-release.md index 8989a2f7b410..dd5def04bfe9 100644 --- a/docs/blog/_posts/2020-06-22-25th-dotty-milestone-release.md +++ b/docs/blog/_posts/2020-06-22-25th-dotty-milestone-release.md @@ -98,7 +98,7 @@ We are looking forward to having you join the team of contributors. Dotty now has a set of widely-used community libraries that are built against every nightly Dotty snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants. -Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build) +Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build) to make sure that our regression suite includes your library. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/blog/_posts/2020-07-27-26th-dotty-milestone-release.md b/docs/blog/_posts/2020-07-27-26th-dotty-milestone-release.md index 06a76455e433..b0d153dded7e 100644 --- a/docs/blog/_posts/2020-07-27-26th-dotty-milestone-release.md +++ b/docs/blog/_posts/2020-07-27-26th-dotty-milestone-release.md @@ -128,7 +128,7 @@ We are looking forward to having you join the team of contributors. Dotty now has a set of widely-used community libraries that are built against every nightly Dotty snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants. -Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build) +Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build) to make sure that our regression suite includes your library. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/blog/_posts/2020-08-31-27th-dotty-milestone-release.md b/docs/blog/_posts/2020-08-31-27th-dotty-milestone-release.md index 641db674abb6..e42e98a1385b 100644 --- a/docs/blog/_posts/2020-08-31-27th-dotty-milestone-release.md +++ b/docs/blog/_posts/2020-08-31-27th-dotty-milestone-release.md @@ -109,7 +109,7 @@ We are looking forward to having you join the team of contributors. Dotty now has a set of widely-used community libraries that are built against every nightly Dotty snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants. -Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build) +Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build) to make sure that our regression suite includes your library. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/blog/_posts/2020-11-09-scala3-m1.md b/docs/blog/_posts/2020-11-09-scala3-m1.md index 5292ad0e8344..ffef5618f9ff 100644 --- a/docs/blog/_posts/2020-11-09-scala3-m1.md +++ b/docs/blog/_posts/2020-11-09-scala3-m1.md @@ -199,7 +199,7 @@ We are looking forward to having you join the team of contributors. Dotty now has a set of widely-used community libraries that are built against every nightly Dotty snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants. -Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build) +Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build) to make sure that our regression suite includes your library. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/blog/_posts/2020-12-18-scala3-m3.md b/docs/blog/_posts/2020-12-18-scala3-m3.md index e0cba2b144d8..41cfa76c0265 100644 --- a/docs/blog/_posts/2020-12-18-scala3-m3.md +++ b/docs/blog/_posts/2020-12-18-scala3-m3.md @@ -231,7 +231,7 @@ We are looking forward to having you join the team of contributors. ## Library authors: Join our community build -Scala 3 is regularly tested against a sample of libraries known as the "community build". You can add your library to the [community build](https://github.com/lampepfl/dotty/tree/master/community-build) by submitting a PR. +Scala 3 is regularly tested against a sample of libraries known as the "community build". You can add your library to the [community build](https://github.com/lampepfl/dotty/tree/main/community-build) by submitting a PR. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/blog/_posts/2021-03-31-scala3-rc2.md b/docs/blog/_posts/2021-03-31-scala3-rc2.md index 8e4439037be5..178dfabfbffc 100644 --- a/docs/blog/_posts/2021-03-31-scala3-rc2.md +++ b/docs/blog/_posts/2021-03-31-scala3-rc2.md @@ -116,7 +116,7 @@ We are looking forward to having you join the team of contributors. Dotty now has a set of widely-used community libraries that are built against every nightly Dotty snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants. -Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build) +Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build) to make sure that our regression suite includes your library. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/blog/_posts/2021-04-21-scala3-rc3.md b/docs/blog/_posts/2021-04-21-scala3-rc3.md index 532bcb4060cb..8651730da93a 100644 --- a/docs/blog/_posts/2021-04-21-scala3-rc3.md +++ b/docs/blog/_posts/2021-04-21-scala3-rc3.md @@ -49,7 +49,7 @@ We are looking forward to having you join the team of contributors. Dotty now has a set of widely-used community libraries that are built against every nightly Dotty snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants. -Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build) +Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build) to make sure that our regression suite includes your library. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/blog/_posts/2021-06-07-scala3.0.1-rc1-release.md b/docs/blog/_posts/2021-06-07-scala3.0.1-rc1-release.md index d4b7ef88df41..e9fac2d0447c 100644 --- a/docs/blog/_posts/2021-06-07-scala3.0.1-rc1-release.md +++ b/docs/blog/_posts/2021-06-07-scala3.0.1-rc1-release.md @@ -147,7 +147,7 @@ According to `git shortlog -sn --no-merges 3.0.0-RC2..3.0.1-RC1`† these are: ## Library authors: Join our community build Scala 3 now has a set of widely-used community libraries that are built against every nightly Scala 3 snapshot. -Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build) +Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build) to make sure that our regression suite includes your library. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/blog/_posts/2021-06-25-scala301-rc2.md b/docs/blog/_posts/2021-06-25-scala301-rc2.md index 136b43928d45..76257d1a8664 100644 --- a/docs/blog/_posts/2021-06-25-scala301-rc2.md +++ b/docs/blog/_posts/2021-06-25-scala301-rc2.md @@ -29,7 +29,7 @@ According to `git shortlog -sn --no-merges 3.0.1-RC1..3.0.1-RC2` these are: ## Library authors: Join our community build Scala 3 now has a set of widely-used community libraries that are built against every nightly Scala 3 snapshot. -Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build) +Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build) to make sure that our regression suite includes your library. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/docs/contributing/debugging.md b/docs/docs/contributing/debugging.md index 84f6937f628f..959ad6706290 100644 --- a/docs/docs/contributing/debugging.md +++ b/docs/docs/contributing/debugging.md @@ -164,7 +164,7 @@ val YshowVarBounds = BooleanSetting("-Yshow-var-bounds" , "Print type varia val YtestPickler = BooleanSetting("-Ytest-pickler" , "self-test for pickling functionality; should be used with -Ystop-after:pickler") ``` -They are defined in [ScalaSettings.scala](https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala). E.g. `YprintPos` is defined as: +They are defined in [ScalaSettings.scala](https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala). E.g. `YprintPos` is defined as: ```scala val YprintPos: Setting[Boolean] = BooleanSetting("-Yprint-pos", "show tree positions.") diff --git a/docs/docs/contributing/getting-started.md b/docs/docs/contributing/getting-started.md index 8b617c04f6c4..c842fd0a49d0 100644 --- a/docs/docs/contributing/getting-started.md +++ b/docs/docs/contributing/getting-started.md @@ -89,7 +89,7 @@ $ sbt For more information, see `scaladoc/README.md`. Before contributing to Dotty, we invite you to consult the -[Dotty Developer Guidelines](https://github.com/lampepfl/dotty/blob/master/CONTRIBUTING.md). +[Dotty Developer Guidelines](https://github.com/lampepfl/dotty/blob/main/CONTRIBUTING.md). Community diff --git a/docs/docs/internals/overall-structure.md b/docs/docs/internals/overall-structure.md index 73964977ba42..f50ab6bf03a7 100644 --- a/docs/docs/internals/overall-structure.md +++ b/docs/docs/internals/overall-structure.md @@ -233,10 +233,10 @@ Phases fall into four categories: * Code generators: These map the transformed trees to Java classfiles or .sjsir files. -[dotty.tools]: https://github.com/lampepfl/dotty/tree/master/compiler/src/dotty/tools -[dotc]: https://github.com/lampepfl/dotty/tree/master/compiler/src/dotty/tools/dotc -[Main]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/Main.scala -[Driver]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/Driver.scala -[Compiler]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/Compiler.scala -[Run]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/Run.scala -[Context]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/core/Contexts.scala +[dotty.tools]: https://github.com/lampepfl/dotty/tree/main/compiler/src/dotty/tools +[dotc]: https://github.com/lampepfl/dotty/tree/main/compiler/src/dotty/tools/dotc +[Main]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/Main.scala +[Driver]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/Driver.scala +[Compiler]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/Compiler.scala +[Run]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/Run.scala +[Context]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/core/Contexts.scala diff --git a/docs/docs/internals/type-system.md b/docs/docs/internals/type-system.md index 7c5f8bf827d9..8fa8912a7118 100644 --- a/docs/docs/internals/type-system.md +++ b/docs/docs/internals/type-system.md @@ -132,8 +132,8 @@ TODO ## Type inference via constraint solving ## TODO -[1]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/core/Types.scala +[1]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/core/Types.scala [2]: https://github.com/samuelgruetter/dotty/blob/classdiagrampdf/dotty-types.pdf [3]: https://github.com/samuelgruetter/scaladiagrams/tree/print-descendants -[4]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/core/TypeComparer.scala -[5]: https://github.com/lampepfl/dotty/blob/master/tests/pos/refinedSubtyping.scala +[4]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/core/TypeComparer.scala +[5]: https://github.com/lampepfl/dotty/blob/main/tests/pos/refinedSubtyping.scala diff --git a/docs/docs/reference/changed-features/structural-types-spec.md b/docs/docs/reference/changed-features/structural-types-spec.md index 5c99afbcc1bb..290189a67eda 100644 --- a/docs/docs/reference/changed-features/structural-types-spec.md +++ b/docs/docs/reference/changed-features/structural-types-spec.md @@ -16,7 +16,7 @@ RefineStat ::= ‘val’ VarDcl | ‘def’ DefDcl | ‘type’ {nl} TypeDcl ## Implementation of Structural Types The standard library defines a universal marker trait -[`scala.Selectable`](https://github.com/lampepfl/dotty/blob/master/library/src/scala/Selectable.scala): +[`scala.Selectable`](https://github.com/lampepfl/dotty/blob/main/library/src/scala/Selectable.scala): ```scala trait Selectable extends Any diff --git a/docs/docs/reference/contextual/multiversal-equality.md b/docs/docs/reference/contextual/multiversal-equality.md index 1af1786374bc..f01b64d2e444 100644 --- a/docs/docs/reference/contextual/multiversal-equality.md +++ b/docs/docs/reference/contextual/multiversal-equality.md @@ -25,7 +25,7 @@ the program will still typecheck, since values of all types can be compared with But it will probably give unexpected results and fail at runtime. Multiversal equality is an opt-in way to make universal equality safer. -It uses a binary type class [`scala.CanEqual`](https://github.com/lampepfl/dotty/blob/master/library/src/scala/CanEqual.scala) +It uses a binary type class [`scala.CanEqual`](https://github.com/lampepfl/dotty/blob/main/library/src/scala/CanEqual.scala) to indicate that values of two given types can be compared with each other. The example above would not typecheck if `S` or `T` was a class that derives `CanEqual`, e.g. @@ -70,7 +70,7 @@ given CanEqual[A, B] = CanEqual.derived given CanEqual[B, A] = CanEqual.derived ``` -The [`scala.CanEqual`](https://github.com/lampepfl/dotty/blob/master/library/src/scala/CanEqual.scala) +The [`scala.CanEqual`](https://github.com/lampepfl/dotty/blob/main/library/src/scala/CanEqual.scala) object defines a number of `CanEqual` given instances that together define a rule book for what standard types can be compared (more details below). diff --git a/docs/docs/reference/enums/enums.md b/docs/docs/reference/enums/enums.md index e68f54fa0dd1..fda03d2dee81 100644 --- a/docs/docs/reference/enums/enums.md +++ b/docs/docs/reference/enums/enums.md @@ -152,7 +152,7 @@ scala> Color.Red.compareTo(Color.Green) val res15: Int = -1 ``` -For a more in-depth example of using Scala 3 enums from Java, see [this test](https://github.com/lampepfl/dotty/tree/master/tests/run/enum-java). In the test, the enums are defined in the `MainScala.scala` file and used from a Java source, `Test.java`. +For a more in-depth example of using Scala 3 enums from Java, see [this test](https://github.com/lampepfl/dotty/tree/main/tests/run/enum-java). In the test, the enums are defined in the `MainScala.scala` file and used from a Java source, `Test.java`. ### Implementation diff --git a/docs/docs/reference/experimental/explicit-nulls.md b/docs/docs/reference/experimental/explicit-nulls.md index 1ee404a44cec..ebdb3356d99e 100644 --- a/docs/docs/reference/experimental/explicit-nulls.md +++ b/docs/docs/reference/experimental/explicit-nulls.md @@ -426,7 +426,7 @@ When dealing with local mutable variables, there are two questions: x = null ``` -See [more examples](https://github.com/lampepfl/dotty/blob/master/tests/explicit-nulls/neg/flow-varref-in-closure.scala). +See [more examples](https://github.com/lampepfl/dotty/blob/main/tests/explicit-nulls/neg/flow-varref-in-closure.scala). Currently, we are unable to track paths with a mutable variable prefix. For example, `x.a` if `x` is mutable. diff --git a/docs/docs/reference/new-types/dependent-function-types-spec.md b/docs/docs/reference/new-types/dependent-function-types-spec.md index aeca72fbe302..c3915ba9b8ac 100644 --- a/docs/docs/reference/new-types/dependent-function-types-spec.md +++ b/docs/docs/reference/new-types/dependent-function-types-spec.md @@ -46,7 +46,7 @@ same way that other functions do, see The example below defines a trait `C` and the two dependent function types `DF` and `IDF` and prints the results of the respective function applications: -[depfuntype.scala]: https://github.com/lampepfl/dotty/blob/master/tests/pos/depfuntype.scala +[depfuntype.scala]: https://github.com/lampepfl/dotty/blob/main/tests/pos/depfuntype.scala ```scala trait C { type M; val m: M } @@ -70,7 +70,7 @@ type IDF = (x: C) ?=> x.M In the following example the depend type `f.Eff` refers to the effect type `CanThrow`: -[eff-dependent.scala]: https://github.com/lampepfl/dotty/blob/master/tests/run/eff-dependent.scala +[eff-dependent.scala]: https://github.com/lampepfl/dotty/blob/main/tests/run/eff-dependent.scala ```scala trait Effect diff --git a/docs/docs/reference/new-types/intersection-types-spec.md b/docs/docs/reference/new-types/intersection-types-spec.md index 4d236c37dcc3..8ed9305e1486 100644 --- a/docs/docs/reference/new-types/intersection-types-spec.md +++ b/docs/docs/reference/new-types/intersection-types-spec.md @@ -98,7 +98,7 @@ glb(A, _) = A // use first In the above, `|T|` means the erased type of `T`, `JArray` refers to the type of Java Array. -See also: [`TypeErasure#erasedGlb`](https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/core/TypeErasure.scala#L289). +See also: [`TypeErasure#erasedGlb`](https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/core/TypeErasure.scala#L289). ## Relationship with Compound Type (`with`) diff --git a/project/Build.scala b/project/Build.scala index 000dfb8e2b6e..e91849fdd1d3 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1394,10 +1394,10 @@ object Build { def generateDocTask = generateDocumentation( - roots, "Scala 3", dest.getAbsolutePath, "master", + roots, "Scala 3", dest.getAbsolutePath, "main", Seq( "-comment-syntax", "wiki", - s"-source-links:docs=github://lampepfl/dotty/master#docs", + s"-source-links:docs=github://lampepfl/dotty/main#docs", "-doc-root-content", docRootFile.toString, "-versions-dictionary-url", "https://scala-lang.org/api/versions.json", @@ -1420,7 +1420,7 @@ object Build { (Test / Build.testcasesOutputDir).value, "scaladoc testcases", "scaladoc/output/testcases", - "master", + "main", Seq("-usejavacp", "-snippet-compiler:scaladoc-testcases/docs=compile", "-siteroot", "scaladoc-testcases/docs") ) }.value, diff --git a/project/scripts/cmdScaladocTests b/project/scripts/cmdScaladocTests index e2eb8fd65470..ce8d310fb248 100755 --- a/project/scripts/cmdScaladocTests +++ b/project/scripts/cmdScaladocTests @@ -38,6 +38,6 @@ dist/target/pack/bin/scaladoc \ -siteroot scaladoc-testcases/docs \ -project-footer "Copyright (c) 2002-2022, LAMP/EPFL" \ -default-template static-site-main \ - -author -groups -revision master -project-version "${DOTTY_BOOTSTRAPPED_VERSION}" \ + -author -groups -revision main -project-version "${DOTTY_BOOTSTRAPPED_VERSION}" \ out/bootstrap/scaladoc-testcases/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/classes > "$tmp" 2>&1 || echo "generated testcases project with scripts" diff -rq "$OUT1" "scaladoc/output/testcases"