Merge branch 'scala:main' into zh-cn/overviews/scala3-book/scala-tools

Author: benluo

_ja/overviews/reflection/annotations-names-scopes.md

@@ -53,7 +53,7 @@ Scala または Java アノテーションに対しては `scalaArgs` は空で
 ## 名前
 
 **名前** (name) は文字列の簡単なラッパーだ。
-[`Name`](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Names$NameApi.html)
+[`Name`](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Names$NameApi.html)
 には 2つのサブタイプ `TermName` と `TypeName` があり (オブジェクトやメンバーのような) 項の名前と
 (クラス、トレイト、型メンバのような) 型の名前を区別する。同じオブジェクト内に同名の項と型が共存することができる。別の言い方をすると、型と項は別の名前空間を持つ。
 
@@ -96,19 +96,19 @@ Scala のプログラムにおいて、「`_root_`」のような特定の名前
 
 「`package`」のようないくつかの名前は型名と項名の両方が存在する。
 標準名は `Universe` クラスの `termNames` と `typeNames` というメンバとして公開されている。
-全ての標準名の仕様は [API doc](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/StandardNames.html) を参照。
+全ての標準名の仕様は [API doc](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/StandardNames.html) を参照。
 
 ## スコープ
 
 **スコープ** (scope) は一般にある構文スコープ内の名前をシンボルに関連付ける。
 スコープは入れ子にすることもできる。リフレクション API
-で公開されているスコープの基底型は [Symbol](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Symbols$Symbol.html) の iterable という最小限のインターフェイスのみを公開する。
+で公開されているスコープの基底型は [Symbol](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Symbols$Symbol.html) の iterable という最小限のインターフェイスのみを公開する。
 
 追加機能は
-[scala.reflect.api.Types#TypeApi](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Types$TypeApi.html)
+[scala.reflect.api.Types#TypeApi](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Types$TypeApi.html)
 内で定義されている `member` と `decls`
 が返す**メンバスコープ** (member scope) にて公開される。
-[scala.reflect.api.Scopes#MemberScope](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Scopes$MemberScope.html)
+[scala.reflect.api.Scopes#MemberScope](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Scopes$MemberScope.html)
 は `sorted` メソッドをサポートしており、これはメンバを**宣言順に**ソートする。
 
 以下に `List` クラスでオーバーライドされている全てのシンボルのリストを宣言順に返す具体例をみてみよう:
@@ -119,7 +119,7 @@ Scala のプログラムにおいて、「`_root_`」のような特定の名前
 ## Expr
 
 構文木の基底型である `scala.reflect.api.Trees#Tree` の他に、型付けされた構文木は
-[`scala.reflect.api.Exprs#Expr`](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Exprs$Expr.html) 型によっても表すことができる。
+[`scala.reflect.api.Exprs#Expr`](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Exprs$Expr.html) 型によっても表すことができる。
 `Expr` は構文木と、その構文木の型に対するアクセスを提供するための型タグをラッピングする。
 `Expr` は主にマクロのために便宜的に型付けられた構文木を作るために使われる。多くの場合、これは
 `reify` と `splice` メソッドが関わってくる。
@@ -175,8 +175,8 @@ Scala コンパイラによってコンパイル時に評価することがで
 
 1. プリミティブ値クラスのリテラル ([Byte](https://www.scala-lang.org/api/current/index.html#scala.Byte)、 [Short](https://www.scala-lang.org/api/current/index.html#scala.Short)、 [Int](https://www.scala-lang.org/api/current/index.html#scala.Int)、 [Long](https://www.scala-lang.org/api/current/index.html#scala.Long)、 [Float](https://www.scala-lang.org/api/current/index.html#scala.Float)、 [Double](https://www.scala-lang.org/api/current/index.html#scala.Double)、 [Char](https://www.scala-lang.org/api/current/index.html#scala.Char)、 [Boolean](https://www.scala-lang.org/api/current/index.html#scala.Boolean) および [Unit](https://www.scala-lang.org/api/current/index.html#scala.Unit))。これは直接対応する型で表される。
 2. 文字列リテラル。これは文字列のインスタンスとして表される。
-3. 一般に [scala.Predef#classOf](https://www.scala-lang.org/api/current/index.html#scala.Predef$@classOf[T]:Class[T]) で構築されるクラスへの参照。[型](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Types$Type.html)として表される。
-4. Java の列挙要素。[シンボル](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Symbols$Symbol.html)として表される。
+3. 一般に [scala.Predef#classOf](https://www.scala-lang.org/api/current/index.html#scala.Predef$@classOf[T]:Class[T]) で構築されるクラスへの参照。[型](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Types$Type.html)として表される。
+4. Java の列挙要素。[シンボル](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Symbols$Symbol.html)として表される。
 
 定数式の用例としては
 
@@ -264,8 +264,8 @@ Java の列挙要素への参照はシンボル (`scala.reflect.api.Symbols#Symb
 
 ## プリティプリンタ
 
-[`Trees`](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Trees.html) と
-[`Types`](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Types.html)
+[`Trees`](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Trees.html) と
+[`Types`](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Types.html)
 を整形して表示するユーティリティを説明しよう。
 
 ### 構文木の表示
@@ -380,7 +380,7 @@ Java の列挙要素への参照はシンボル (`scala.reflect.api.Symbols#Symb
 
 ## 位置情報
 
-**位置情報** ([`Position`](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Position.html))
+**位置情報** ([`Position`](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Position.html))
 はシンボルや構文木のノードの出処を追跡するのに使われる。警告やエラーの表示でよく使われ、プログラムのどこが間違ったのかを正確に表示することができる。位置情報はソースファイルの列と行を表す。
 (ソースファイルの初めからのオフセットは「ポイント」と呼ばれるが、これは便利ではないことがある)
 位置情報はそれが指す行の内容も保持する。全ての構文木やシンボルが位置情報を持つわけではなく、ない場合は

_ja/overviews/reflection/symbols-trees-types.md

@@ -167,7 +167,7 @@ title: シンボル、構文木、型
     scala> val intTpe = universe.definitions.IntTpe
     intTpe: scala.reflect.runtime.universe.Type = Int
 
-標準型のリストは [`scala.reflect.api.StandardDefinitions`](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/StandardDefinitions$StandardTypes.html) 内の `StandardTypes`
+標準型のリストは [`scala.reflect.api.StandardDefinitions`](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/StandardDefinitions$StandardTypes.html) 内の `StandardTypes`
 トレイトにて定義されている。
 
 ### 型の一般的な演算

_overviews/collections-2.13/overview.md

@@ -16,7 +16,7 @@ Scala collections systematically distinguish between mutable and
 immutable collections. A _mutable_ collection can be updated, reduced or
 extended in place. This means you can change, add, or remove elements
 of a collection as a side effect. _Immutable_ collections, by
-contrast, never change. You have still operations that simulate
+contrast, never change. You still have operations that simulate
 additions, removals, or updates, but those operations will in each
 case return a new collection and leave the old collection unchanged.
 
@@ -36,7 +36,7 @@ always yield a collection with the same elements.
 
 A collection in package `scala.collection.mutable` is known to have
 some operations that change the collection in place. So dealing with
-mutable collection means you need to understand which code changes
+a mutable collection means you need to understand which code changes
 which collection when.
 
 A collection in package `scala.collection` can be either mutable or

_overviews/reflection/annotations-names-scopes.md

@@ -58,7 +58,7 @@ represent different kinds of Java annotation arguments:
 ## Names
 
 Names are simple wrappers for strings.
-[Name](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Names$NameApi.html)
+[Name](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Names$NameApi.html)
 has two subtypes `TermName` and `TypeName` which distinguish names of terms (like
 objects or members) and types (like classes, traits, and type members). A term
 and a type of the same name can co-exist in the same object. In other words,
@@ -104,19 +104,19 @@ There are both
 Some names, such as "package", exist both as a type name and a term name.
 Standard names are made available through the `termNames` and `typeNames` members of
 class `Universe`. For a complete specification of all standard names, see the
-[API documentation](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/StandardNames.html).
+[API documentation](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/StandardNames.html).
 
 ## Scopes
 
 A scope object generally maps names to symbols available in a corresponding
 lexical scope. Scopes can be nested. The base type exposed in the reflection
 API, however, only exposes a minimal interface, representing a scope as an
-iterable of [Symbol](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Symbols$Symbol.html)s.
+iterable of [Symbol](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Symbols$Symbol.html)s.
 
 Additional functionality is exposed in *member scopes* that are returned by
 `members` and `decls` defined in
-[scala.reflect.api.Types#TypeApi](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Types$TypeApi.html).
-[scala.reflect.api.Scopes#MemberScope](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Scopes$MemberScope.html)
+[scala.reflect.api.Types#TypeApi](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Types$TypeApi.html).
+[scala.reflect.api.Scopes#MemberScope](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Scopes$MemberScope.html)
 supports the `sorted` method, which sorts members *in declaration order*.
 
 The following example returns a list of the symbols of all final members
@@ -129,7 +129,7 @@ of the `List` class, in declaration order:
 
 In addition to type `scala.reflect.api.Trees#Tree`, the base type of abstract
 syntax trees, typed trees can also be represented as instances of type
-[`scala.reflect.api.Exprs#Expr`](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Exprs$Expr.html).
+[`scala.reflect.api.Exprs#Expr`](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Exprs$Expr.html).
 An `Expr` wraps
 an abstract syntax tree and an internal type tag to provide access to the type
 of the tree. `Expr`s are mainly used to simply and conveniently create typed
@@ -189,9 +189,9 @@ expressions are compile-time constants (see [section 6.24 of the Scala language
 
 2. String literals - represented as instances of the string.
 
-3. References to classes, typically constructed with [scala.Predef#classOf](https://www.scala-lang.org/api/current/index.html#scala.Predef$@classOf[T]:Class[T]) - represented as [types](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Types$Type.html).
+3. References to classes, typically constructed with [scala.Predef#classOf](https://www.scala-lang.org/api/current/index.html#scala.Predef$@classOf[T]:Class[T]) - represented as [types](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Types$Type.html).
 
-4. References to Java enumeration values - represented as [symbols](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Symbols$Symbol.html).
+4. References to Java enumeration values - represented as [symbols](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Symbols$Symbol.html).
 
 Constant expressions are used to represent
 
@@ -287,8 +287,8 @@ Example:
 ## Printers
 
 Utilities for nicely printing
-[`Trees`](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Trees.html) and
-[`Types`](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Types.html).
+[`Trees`](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Trees.html) and
+[`Types`](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Types.html).
 
 ### Printing Trees
 
@@ -408,7 +408,7 @@ additionally shows the unique identifiers of symbols, as well as their kind
 ## Positions
 
 Positions (instances of the
-[Position](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Position.html) trait)
+[Position](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Position.html) trait)
 are used to track the origin of symbols and tree nodes. They are commonly used when
 displaying warnings and errors, to indicate the incorrect point in the
 program. Positions indicate a column and line in a source file (the offset

_overviews/reflection/overview.md

@@ -325,7 +325,7 @@ reflection, such as `Types`, `Trees`, and `Annotations`. For more details, see
 the section of this guide on
 [Universes]({{ site.baseurl}}/overviews/reflection/environment-universes-mirrors.html),
 or the
-[Universes API docs](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Universe.html)
+[Universes API docs](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Universe.html)
 in package `scala.reflect.api`.
 
 To use most aspects of Scala reflection, including most code examples provided
@@ -345,5 +345,5 @@ different flavors of mirrors must be used.
 For more details, see the section of this guide on
 [Mirrors]({{ site.baseurl}}/overviews/reflection/environment-universes-mirrors.html),
 or the
-[Mirrors API docs](https://www.scala-lang.org/api/current/scala-reflect/scala/reflect/api/Mirrors.html)
+[Mirrors API docs](https://www.scala-lang.org/api/2.x/scala-reflect/scala/reflect/api/Mirrors.html)
 in package `scala.reflect.api`.

_overviews/scala3-book/fp-intro.md

@@ -10,7 +10,7 @@ next-page: fp-what-is-fp
 
 
 Scala lets you write code in an object-oriented programming (OOP) style, a functional programming (FP) style, and also in a hybrid style---using both approaches in combination.
-[As Martin Odersky has stated](https://twitter.com/alexelcu/status/996408359514525696), the essence of Scala is a fusion of functional and object-oriented programming in a typed setting:
+As stated by Martin Odersky, the creator of Scala, the essence of Scala is a fusion of functional and object-oriented programming in a typed setting:
 
 - Functions for the logic
 - Objects for the modularity

_overviews/scala3-migration/incompat-contextual-abstractions.md

@@ -11,7 +11,7 @@ The redesign of [contextual abstractions]({{ site.scala3ref }}/contextual) bring
 
 |Incompatibility|Scala 2.13|Scala 3 Migration Rewrite|Scalafix Rule|Runtime Incompatibiltiy|
 |--- |--- |--- |--- |--- |
-|[Type of implicit def](#type-of-implicit-definition)|||[✅](https://github.com/ohze/scala-rewrites#fixexplicittypesexplicitimplicittypes)||
+|[Type of implicit def](#type-of-implicit-definition)|||[✅](https://scalacenter.github.io/scalafix/docs/rules/ExplicitResultTypes.html)||
 |[Implicit views](#implicit-views)||||**Possible**|
 |[View bounds](#view-bounds)|Deprecation||||
 |[Ambiguous conversion on `A` and `=> A`](#ambiguous-conversion-on-a-and--a)|||||
@@ -21,7 +21,7 @@ The redesign of [contextual abstractions]({{ site.scala3ref }}/contextual) bring
 The type of implicit definitions (`val` or `def`) needs to be given explicitly in Scala 3.
 They cannot be inferred anymore.
 
-The Scalafix rule named `ExplicitImplicitTypes` in [ohze/scala-rewrites](https://github.com/ohze/scala-rewrites#fixexplicittypesexplicitimplicittypes) repository can write the missing type annotations automatically.
+The Scalafix rule named [ExplicitResultTypes](https://scalacenter.github.io/scalafix/docs/rules/ExplicitResultTypes.html) can write the missing type annotations automatically.
 
 ## Implicit Views
 
@@ -147,4 +147,4 @@ implicit def lazyBoolFoo(lazyBool:  => Boolean): Foo = ???
 
 -true.foo()
 +boolFoo(true).foo()
-{% endhighlight %}
+{% endhighlight %}

_overviews/scala3-migration/incompat-syntactic.md

@@ -18,7 +18,7 @@ It is worth noting that most of the changes can be automatically handled during
 |--- |--- |--- |--- |
 |[Restricted keywords](#restricted-keywords)||✅||
 |[Procedure syntax](#procedure-syntax)|Deprecation|✅|[✅](https://scalacenter.github.io/scalafix/docs/rules/ProcedureSyntax.html)|
-|[Parentheses around lambda parameter](#parentheses-around-lambda-parameter)||✅|[✅](https://github.com/ohze/scala-rewrites/tree/dotty/#fixscala213parensaroundlambda)|
+|[Parentheses around lambda parameter](#parentheses-around-lambda-parameter)||✅||
 |[Open brace indentation for passing an argument](#open-brace-indentation-for-passing-an-argument)||✅||
 |[Wrong indentation](#wrong-indentation)||||
 |[`_` as a type parameter](#_-as-a-type-parameter)||||

_overviews/scala3-migration/incompatibility-table.md

@@ -37,7 +37,7 @@ Some of the old syntax is not supported anymore.
 |--- |--- |--- |--- |
 |[Restricted keywords](incompat-syntactic.html#restricted-keywords)||✅||
 |[Procedure syntax](incompat-syntactic.html#procedure-syntax)|Deprecation|✅|[✅](https://scalacenter.github.io/scalafix/docs/rules/ProcedureSyntax.html)|
-|[Parentheses around lambda parameter](incompat-syntactic.html#parentheses-around-lambda-parameter)||✅|[✅](https://github.com/ohze/scala-rewrites/tree/dotty/#fixscala213parensaroundlambda)|
+|[Parentheses around lambda parameter](incompat-syntactic.html#parentheses-around-lambda-parameter)||✅||
 |[Open brace indentation for passing an argument](incompat-syntactic.html#open-brace-indentation-for-passing-an-argument)||✅||
 |[Wrong indentation](incompat-syntactic.html#wrong-indentation)||||
 |[`_` as a type parameter](incompat-syntactic.html#_-as-a-type-parameter)||||
@@ -63,7 +63,7 @@ The redesign of [contextual abstractions]({{ site.scala3ref }}/contextual) bring
 
 |Incompatibility|Scala 2.13|Scala 3 Migration Rewrite|Scalafix Rule|Runtime Incompatibility|
 |--- |--- |--- |--- |--- |
-|[Type of implicit def](incompat-contextual-abstractions.html#type-of-implicit-definition)|||[✅](https://github.com/ohze/scala-rewrites#fixexplicittypesexplicitimplicittypes)||
+|[Type of implicit def](incompat-contextual-abstractions.html#type-of-implicit-definition)|||[✅](https://scalacenter.github.io/scalafix/docs/rules/ExplicitResultTypes.html)||
 |[Implicit views](incompat-contextual-abstractions.html#implicit-views)||||**Possible**|
 |[View bounds](incompat-contextual-abstractions.html#view-bounds)|Deprecation||||
 |[Ambiguous conversion on `A` and `=> A`](incompat-contextual-abstractions.html#ambiguous-conversion-on-a-and--a)|||||