From 3086418f8e63f7a8fb0114f4a34e2115fed8cb2f Mon Sep 17 00:00:00 2001 From: Raphael Jolly Date: Tue, 16 Mar 2021 17:45:30 +0100 Subject: [PATCH] Fix some typos in doc --- docs/docs/reference/changed-features/implicit-resolution.md | 6 +++--- docs/docs/reference/changed-features/overload-resolution.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/docs/reference/changed-features/implicit-resolution.md b/docs/docs/reference/changed-features/implicit-resolution.md index ed212bb44085..90b6c80cf3bf 100644 --- a/docs/docs/reference/changed-features/implicit-resolution.md +++ b/docs/docs/reference/changed-features/implicit-resolution.md @@ -76,7 +76,7 @@ a type: 1. If _T_ is a reference to an opaque type alias named _A_, _S_ includes a reference to an object _A_ defined in the same scope as the type, if it exists, as well as the implicit scope of _T_'s underlying type or bounds. - 1. If _T_ is a reference to an an abstract type or match type alias + 1. If _T_ is a reference to an abstract type or match type alias named _A_, _S_ includes a reference to an object _A_ defined in the same scope as the type, if it exists, as well as the implicit scopes of _T_'s given bounds. 1. If _T_ is a reference to an anchor of the form _p.A_ then _S_ also includes all term references on the path _p_. @@ -107,8 +107,8 @@ which means that the alternative `c` would be chosen as solution! Scala 2's somewhat puzzling behavior with respect to ambiguity has been exploited to implement the analogue of a "negated" search in implicit resolution, where a query `Q1` fails if some other query `Q2` succeeds and `Q1` succeeds if `Q2` fails. With the new cleaned up behavior -these techniques no longer work. But there is now a new special type `scala.util.Not` -which implements negation directly. For any query type `Q`: `Not[Q]` succeeds if and only if +these techniques no longer work. But there is now a new special type `scala.util.NotGiven` +which implements negation directly. For any query type `Q`, `NotGiven[Q]` succeeds if and only if the implicit search for `Q` fails. **5.** The treatment of divergence errors has also changed. A divergent implicit is treated as a normal failure, after which alternatives are still tried. This also makes sense: Encountering a divergent implicit means that we assume that no finite solution can be found on the corresponding path, but another path can still be tried. By contrast, diff --git a/docs/docs/reference/changed-features/overload-resolution.md b/docs/docs/reference/changed-features/overload-resolution.md index 8d2e61441c51..63eb3b318371 100644 --- a/docs/docs/reference/changed-features/overload-resolution.md +++ b/docs/docs/reference/changed-features/overload-resolution.md @@ -49,7 +49,7 @@ overload resolution based on additional argument blocks. The handling of function values with missing parameter types has been improved. We can now pass such values in the first argument list of an overloaded application, provided that the remaining parameters suffice for picking a variant of the overloaded function. -For example, the following code compiles in Scala 3, while it results in an +For example, the following code compiles in Scala 3, while it results in a missing parameter type error in Scala2: ```scala