Merge branch 'main' into main

Author: Zeimyth

Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
     concurrent-ruby (1.1.8)

_config.yml

@@ -45,6 +45,8 @@ collections:
   getting-started:
     output: true
     permalink: /:collection/:path.html
+  scala3-reference: # not really a collection, but this is the only way I found to be able to generate the navigation bar on the right
+    output: true
   ja: # Japanese translations
     output: true
     permalink: /:collection/:path.html
@@ -123,6 +125,25 @@ defaults:
       overview-name: "Macros in Scala 3"
       layout: multipage-overview
       permalink: "/scala3/guides/macros/:title.html"
+  -
+    scope:
+      path: "_overviews/scala3-scaladoc"
+    values:
+      scala3: true
+      partof: scala3-scaladoc
+      overview-name: "Scaladoc"
+      layout: multipage-overview
+      permalink: "/scala3/guides/scaladoc/:title.html"
+  -
+    scope:
+      path: "_scala3-reference"
+    values:
+      scala3: true
+      partof: scala3-reference
+      type: section
+      overview-name: "Scala 3 Language Reference"
+      layout: multipage-overview
+      permalink: "/scala3/reference/:path.html"
   -
     scope:
       path: "scala3"
@@ -133,7 +154,7 @@ defaults:
 highlighter: rouge
 permalink: /:categories/:title.html:output_ext
 baseurl:
-scala3ref: "https://dotty.epfl.ch/docs/reference"
+scala3ref: "/scala3/reference"
 exclude: ["vendor"]
 plugins:
   - jekyll-redirect-from

_data/scala3-doc-nav-header.yml

@@ -12,6 +12,6 @@
 - title: Migrate
   url: "/scala3/guides/migration/compatibility-intro.html"
 - title: Reference
-  url: "https://dotty.epfl.ch/docs/reference/overview.html"
+  url: "/scala3/reference/overview.html"
 - title: API
-  url: "https://dotty.epfl.ch/api/index.html"
+  url: "https://scala-lang.org/api/3.x/"

_includes/sidebar-toc-multipage-overview.html

@@ -9,7 +9,7 @@ <h5 class="contents">Contents</h5>
         {% endif %}
 
       <ul>
-        {% assign sorted = site.overviews | sort: 'num' %}
+        {% assign sorted = site[page.collection] | sort: 'num' %}
         {% for pg in sorted %}
 					{% if pg.num == page.num %}
 						{% capture toc %}

_ja/index.md

@@ -35,11 +35,11 @@ scala3-sections:
       - title: "API"
         description: "Scala 3 の全バージョンのAPIドキュメント"
         icon: "fa fa-file-text"
-        link: https://dotty.epfl.ch/api/index.html
+        link: https://scala-lang.org/api/3.x/
       - title: "Language Reference"
         description: "Scala 3 の言語仕様"
         icon: "fa fa-book"
-        link: https://dotty.epfl.ch/docs/reference/overview.html
+        link: /scala3/reference/overview.html
 
 scala2-sections:
 

_ja/scala3/contribute-to-docs.md

@@ -47,7 +47,7 @@ Scala 3 の高品質なドキュメンテーションを作るためのいくつ
 
 
 ## Scala 3 Language Reference
-The [Dotty reference](https://dotty.epfl.ch/docs/reference/overview.html) は Scala 3 になる予定である。これにはさまざまな言語仕様に関する公式のプレゼンテーションや技術的情報が含まれている。
+The [Dotty reference](/scala3/reference/overview.html) は Scala 3 になる予定である。これにはさまざまな言語仕様に関する公式のプレゼンテーションや技術的情報が含まれている。
 
 - [Sources](https://github.com/lampepfl/dotty/tree/master/docs/docs/reference)
 - [Issues](https://github.com/lampepfl/dotty/issues)

_ja/scala3/index.md

@@ -36,9 +36,9 @@ sections:
       - title: "API"
         description: "Scala 3 の全バージョンのAPIドキュメント"
         icon: "fa fa-file-text"
-        link: https://dotty.epfl.ch/api/index.html
+        link: https://scala-lang.org/api/3.x/
       - title: "Language Reference"
         description: "Scala 3 の言語仕様"
         icon: "fa fa-book"
-        link: https://dotty.epfl.ch/docs/reference/overview.html
+        link: /scala3/reference/overview.html
 ---

_ja/scala3/new-in-scala3.md

@@ -100,7 +100,7 @@ Scala 3 のメタプログラミングについてもっと知りたいかたは
 [creator]: {{ site.scala3ref }}/other-new-features/creator-applications.html
 [migration]: {% link _overviews/scala3-migration/compatibility-intro.md %}
 
-[implicits]: {{ site.scala3ref }}/contextual/motivation.html
+[implicits]: {{ site.scala3ref }}/contextual.html
 [contextual-using]: {{ site.scala3ref }}/contextual/using-clauses.html
 [contextual-givens]: {{ site.scala3ref }}/contextual/givens.html
 [contextual-extension]: {{ site.scala3ref }}/contextual/extension-methods.html

_overviews/FAQ/index.md

@@ -149,6 +149,23 @@ has a good summary of all the meanings it has.
 Note that, even if the specific meaning is different,
 according to the situation, it usually means _"anything"_.
 
+### Why doesn't my function literal with `_` in it work?
+
+Not all function literals (aka lambdas) can be expressed with the `_`
+syntax.
+
+Every occurrence of `_` introduces a new variable.  So `_ + _` means
+`(x, y) => x + y`, not `x => x + x`.  The latter function cannot be
+written using the `_` syntax.
+
+Also, the scope of `_` is always the smallest enclosing expression.
+The scope is determined purely syntactically, during parsing, without
+regard to types. So for example, `foo(_ + 1)` always means `foo(x =>
+x + 1)`; it never means `x => foo(x + 1)`.  The latter function cannot
+be written using the `_` syntax.
+
+See also [SLS 6.23.2](https://scala-lang.org/files/archive/spec/2.13/06-expressions.html#placeholder-syntax-for-anonymous-functions).
+
 ### Can I chain or nest implicit conversions?
 
 Not really, but you can [make it work](https://stackoverflow.com/a/5332804).
@@ -186,8 +203,8 @@ and a [summary with practical differences](https://tpolecat.github.io/2014/06/09
 
 Note that in **Scala 3** the differences are fewer;
 for example, they will be able to
-[accept implicit parameters](https://dotty.epfl.ch/docs/reference/contextual/context-functions.html)
-as well as [type parameters](https://dotty.epfl.ch/docs/reference/new-types/polymorphic-function-types.html).
+[accept implicit parameters](/scala3/reference/contextual/context-functions.html)
+as well as [type parameters](/scala3/reference/new-types/polymorphic-function-types.html).
 
 Nevertheless, it is still recommended to use methods most of the time,
 unless you absolutely need a function. And, thanks to
@@ -234,3 +251,24 @@ Not really. See [this answer on Stack Overflow](https://stackoverflow.com/a/6525
 
 The latter has a singleton type, which is too specific.
 See [answer on Stack Overflow](https://stackoverflow.com/a/65258340/4111404).
+
+### I got a `StackOverflowError` while compiling my code. Is it a compiler bug?
+
+It might be.
+
+To find out, try giving the compiler more stack and see if the
+error goes away.
+
+It's possible for the compiler to run out of stack when compiling some
+kinds of heavily nested code. The JVM's default stack size is rather
+small, so this can happen sooner than you might expect.
+
+The stack size can be changed by passing `-Xss...` at JVM startup, for
+example `-Xss16M`.  How to do this depends on what IDE and/or build
+tool you are using.  For sbt, add it to `.jvmopts`.
+
+If the stack overflow doesn't go away no matter how much stack you
+give the compiler, then it's a compiler bug. Please report it on the
+[Scala 2 bug tracker](https://github.com/scala/bug/issues) or [Scala 3
+bug tracker](https://github.com/lampepfl/dotty/issues), but check
+first if it's a duplicate of an existing ticket.

_overviews/jdk-compatibility/overview.md

@@ -12,10 +12,9 @@ Sometimes new JVM and JDK (Java Development Kit) versions require us to update S
 
 | JDK version | Minimum Scala versions           | Recommended Scala versions                                 |
 |:-----------:|:---------------------------------|:-----------------------------------------------------------|
+| 18          | 2.13.7 (forthcoming), 2.12.15 (forthcoming) | 2.13.7 (forthcoming), 2.12.15 (forthcoming)    |
 | 17          | 2.13.6, 2.12.15 (forthcoming)    | 2.13.6, 2.12.15 (forthcoming)                              |
 | 16          | 2.13.5, 2.12.14                  | 2.13.6, 2.12.14                                            |
-| 13, 14, 15  | 2.13.2, 2.12.11                  | 2.13.6, 2.12.14                                            |
-| 12          | 2.13.1, 2.12.9                   | 2.13.6, 2.12.14                                            |
 | 11          | 2.13.0, 2.12.4, 2.11.12          | 2.13.6, 2.12.14, 2.11.12                                   |
 | 8           | 2.13.0, 2.12.0, 2.11.0, 2.10.2   | 2.13.6, 2.12.14, 2.11.12, 2.10.7                           |
 | 6, 7        | 2.11.0, 2.10.0                   | 2.11.12, 2.10.7                                            |
@@ -24,7 +23,7 @@ Even when a version combination isn't listed as supported, most features may sti
 
 In general, Scala works on JDK 11+, including GraalVM, but it probably won't take special advantage of features that were added after JDK 8. See [below](#jdk-11-compatibility-notes).
 
-Lightbend offers [commercial support](https://www.lightbend.com/lightbend-platform-subscription) for Scala. The linked page includes contact information for inquiring about supported and recommended versions.
+Lightbend offers [commercial support](https://www.lightbend.com/lightbend-platform-subscription) for Scala 2. The linked page includes contact information for inquiring about supported and recommended versions.
 
 ## Running versus compiling
 
@@ -56,7 +55,7 @@ OpenJDK comes in various flavors, offered by different providers.  We build and
 
 ## JDK 11 compatibility notes
 
-Although the table above jumps from 8 to 11, JDK 9 and 10 will probably also work wherever 11 does. But unlike 9 and 10, 11 is an LTS release, so 11 is what we actually test on and recommend.
+The Scala test suite and Scala community build are green on JDK 11.
 
 The Scala compiler does not enforce the restrictions of the Java Platform Module System, which means that code that typechecks may incur linkage errors at runtime. Scala 2.13.x will eventually provide [rudimentary support](https://github.com/scala/scala/pull/7218) for this (perhaps only in nightlies built on JDK 11).
 
@@ -67,32 +66,30 @@ To track progress on JDK 11 related issues, watch:
 * the ["Support JDK 11"](https://github.com/scala/scala-dev/issues/139 "scala/scala-dev #139") issue
 * the [jdk11 label](https://github.com/scala/bug/labels/jdk11) in scala/bug
 
-To help with testing on JDK 11, see [scala/scala-dev#559](https://github.com/scala/scala-dev/issues/559).
-
-## JDK 12, 13, 14, and 15 compatibility notes
-
-JDK 14 was released in March 2020, and JDK 15 was released in September 2020. But 12, 13, 14, 15 are not LTS releases, so the remarks above about non-LTS releases apply.  The next LTS release will be JDK 17.
-
-JDK 12, 13, 14, and 15 are expected to work wherever JDK 11 does. The Scala community build now runs on JDK 15 (as well as 11 and 8).
-
-As of October 2020, the [jdk12](https://github.com/scala/bug/labels/jdk12) and [jdk13](https://github.com/scala/bug/labels/jdk13) labels in scala/bug have no open bugs. New issues will likely be reported against the newer non-LTS [jdk14 label](https://github.com/scala/bug/labels/jdk14) and [jdk15 label](https://github.com/scala/bug/labels/jdk15) and [jdk16 label](https://github.com/scala/bug/labels/jdk15) or the LTS [jdk11 label](https://github.com/scala/bug/labels/jdk11).
-
-As far as we know, 12, 13, 14, and 15 are similar to 11 with respect to Scala compatibility.
-
 ## JDK 16 compatibility notes
 
 JDK 16 was released in March 2021. It is not an LTS release, so the remarks above about non-LTS releases apply.  The next LTS release will be JDK 17.
 
+JDK 16 is expected to work wherever JDK 17 does, and in most cases wherever JDK 11 does.  See the [jdk11](https://github.com/scala/bug/labels/jdk11) and [jdk17](https://github.com/scala/bug/labels/jdk17) labels in the Scala 2 bug tracker.
+
 The Scala build and test suite pass on JDK 16, and so does the Scala community build. We shipped improved JDK 16 support in [Scala 2.13.5](https://github.com/scala/scala/releases/tag/v2.13.5) and [2.12.14](https://github.com/scala/scala/releases/tag/v2.12.14).
 
 ## JDK 17 compatibility notes
 
-JDK 17 prereleases are already available. As of June 2021, the feature set is frozen. The final release is [targeted](https://openjdk.java.net/projects/jdk/17/) for September 2021. JDK 17 will be an LTS release.
+JDK 17 will be an LTS release.
+
+JDK 17 prereleases are already available. Since June 2021, the feature set is frozen. The final release is [targeted](https://openjdk.java.net/projects/jdk/17/) for September 2021.
 
-The Scala community build passes on JDK 17. We are in the process of making Scala's own build and test suite pass.
+The Scala test suite and Scala community build are green on JDK 17.
 
 Scala 2.13.6 already supports JDK 17. Scala 2.12.14 mostly works as well, but there is a known issue with lambda deserialiation; a fix will ship in Scala 2.12.15 (see [release timing thread](https://contributors.scala-lang.org/t/scala-2-12-15-planning/5152)).
 
+## JDK 18 compatibility notes
+
+Early access builds of JDK 18, a non-LTS release, are already available.
+
+We will ship basic JDK 18 support in Scala 2.13.7 and 2.12.15. (The needed fixes are already available in nightly builds of 2.13 and 2.12.)
+
 ## GraalVM Native Image compatibility notes
 
 There are several records of successfully using Scala with [GraalVM](https://www.graalvm.org) Native Image(i.e.: ahead of time compiler) to produce directly executable binaries.

_overviews/parallel-collections/overview.md

@@ -12,6 +12,8 @@ permalink: /overviews/parallel-collections/:title.html
 
 **Aleksandar Prokopec, Heather Miller**
 
+If you're using Scala 2.13+ and want to use Scala's parallel collections, you'll have to import a separate module, as described [here](https://github.com/scala/scala-parallel-collections).
+
 ## Motivation
 
 Amidst the shift in recent years by processor manufacturers from single to

_overviews/parallel-collections/performance.md

@@ -122,6 +122,6 @@ depends on many factors. Some of them, but not all, include:
 2. [Dynamic compilation and performance measurement, Brian Goetz][2]
 3. [Scala library benchmarks][3]
 
-  [1]: https://www.ibm.com/developerworks/java/library/j-jtp02225/index.html "flawed-benchmark"
-  [2]: https://www.ibm.com/developerworks/library/j-jtp12214/ "dynamic-compilation"
+  [1]: https://web.archive.org/web/20210305174819/https://www.ibm.com/developerworks/java/library/j-jtp02225/index.html "flawed-benchmark"
+  [2]: https://web.archive.org/web/20210228055617/http://www.ibm.com/developerworks/library/j-jtp12214/ "dynamic-compilation"
   [3]: https://github.com/scala/scala/tree/2.12.x/test/benchmarks

_overviews/scala3-book/ca-extension-methods.md

@@ -60,7 +60,7 @@ import lib.circumference
 aCircle.circumference
 ```
 
-The compiler also support you if the import is missing by showing a detailed compilation error message such as the following:
+The compiler also supports you if the import is missing by showing a detailed compilation error message such as the following:
 
 ```text
 value circumference is not a member of Circle, but could be made available as an extension method.

_overviews/scala3-book/ca-given-imports.md

@@ -14,7 +14,7 @@ The basic form is shown in this example:
 ```scala
 object A:
   class TC
-  given tc as TC
+  given tc: TC = ???
   def f(using TC) = ???
 
 object B:

_overviews/scala3-book/ca-summary.md

@@ -27,4 +27,4 @@ A few more advanced topics aren’t covered here, including:
 Those topics are discussed in detail in the [Reference documentation][ref].
 
 
-[ref]: {{ site.scala3ref }}/contextual/motivation.html
+[ref]: {{ site.scala3ref }}/contextual.html

_overviews/scala3-book/first-look-at-types.md

@@ -276,5 +276,5 @@ Alternatives to `null` are discussed in the [Functional Programming chapter][fp]
 [matchable]: {{ site.scala3ref }}/other-new-features/matchable.html
 [interpolation]: {% link _overviews/core/string-interpolation.md %}
 [fp]: {% link _overviews/scala3-book/fp-intro.md %}
-[option-api]: https://dotty.epfl.ch/api/scala/Option.html
+[option-api]: https://scala-lang.org/api/3.x/scala/Option.html
 [safe-null]: {{ site.scala3ref }}/other-new-features/explicit-nulls.html

_overviews/scala3-book/interacting-with-java.md

@@ -2,8 +2,8 @@
 title: Interacting with Java
 type: chapter
 description: This page demonstrates how Scala code can interact with Java, and how Java code can interact with Scala code.
-num: 70
-previous-page: scala-tools
+num: 72
+previous-page: tools-worksheets
 next-page: scala-for-java-devs
 ---
 

_overviews/scala3-book/scala-features.md

@@ -134,7 +134,7 @@ As Heather Miller states, Scala is considered to be a [strong, statically-typed
 - You can refactor your code with confidence
 - Method type declarations tell readers what the method does, and help serve as documentation
 - Scalability and maintainability: types help ensure correctness across arbitrarily large applications and development teams
-- Strong typing in combination with excellent inference enables mechanisms like [contextual abstraction]({{ site.scala3ref }}/contextual/motivation.html) that allows you to omit boilerplate code. Often, this boilerplate code can be inferred by the compiler, based on type definitions and a given context.
+- Strong typing in combination with excellent inference enables mechanisms like [contextual abstraction]({{ site.scala3ref }}/contextual.html) that allows you to omit boilerplate code. Often, this boilerplate code can be inferred by the compiler, based on type definitions and a given context.
 
 {% comment %}
 In that list:
@@ -161,7 +161,7 @@ In that list:
 Scala’s type system enforces, at compile-time, that abstractions are used in a safe and coherent manner.
 In particular, the type system supports:
 
-- [Type inference](/tour/type-inference.html)
+- [Inferred types]({% link _overviews/scala3-book/types-inferred.md %})
 - [Generic classes]({% link _overviews/scala3-book/types-generics.md %})
 - [Variance annotations]({% link _overviews/scala3-book/types-variance.md %})
 - [Upper](/tour/upper-type-bounds.html) and [lower](/tour/lower-type-bounds.html) type bounds
@@ -239,7 +239,7 @@ In Scala, a context parameter directly leads to an inferred argument term that c
 Use cases for this concept include implementing [type classes]({% link _overviews/scala3-book/ca-type-classes.md %}), establishing context, dependency injection, expressing capabilities, computing new types, and proving relationships between them.
 
 Scala 3 makes this process more clear than ever before.
-Read about contextual abstractions in the [Reference documentation]({{ site.scala3ref }}/contextual/motivation.html).
+Read about contextual abstractions in the [Reference documentation]({{ site.scala3ref }}/contextual.html).
 
 
 ### Client & server

_overviews/scala3-book/scala-for-java-devs.md

@@ -2,7 +2,7 @@
 title: Scala for Java Developers
 type: chapter
 description: This page is for Java developers who are interested in learning about Scala 3.
-num: 71
+num: 73
 previous-page: interacting-with-java
 next-page: scala-for-javascript-devs
 ---

_overviews/scala3-book/scala-for-javascript-devs.md

@@ -2,7 +2,7 @@
 title: Scala for JavaScript Developers
 type: chapter
 description: This chapter provides an introduction to Scala 3 for JavaScript developers
-num: 72
+num: 74
 previous-page: scala-for-java-devs
 next-page: scala-for-python-devs
 ---

_overviews/scala3-book/scala-for-python-devs.md

@@ -2,7 +2,7 @@
 title: Scala for Python Developers
 type: chapter
 description: This page is for Python developers who are interested in learning about Scala 3.
-num: 73
+num: 75
 previous-page: scala-for-javascript-devs
 next-page:
 ---
@@ -1078,7 +1078,7 @@ Those lists are used in the following table, that shows how to apply mapping and
   <tbody>
     <tr>
       <td class="python-block">
-        <code>f = lambda x: x if x &gt; 1 else 1
+        <code>f = lambda x: x &gt; 1
         <br>x = filter(f, numbers)</code>
       </td>
     </tr>