Skip to content

Commit 0b70fff

Browse files
authored
Merge pull request #11775 from rjolly/docfix
Fix some typos in doc
2 parents a582d01 + 3086418 commit 0b70fff

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

docs/docs/reference/changed-features/implicit-resolution.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ a type:
7676
1. If _T_ is a reference to an opaque type alias named _A_, _S_ includes
7777
a reference to an object _A_ defined in the same scope as the type, if it exists,
7878
as well as the implicit scope of _T_'s underlying type or bounds.
79-
1. If _T_ is a reference to an an abstract type or match type alias
79+
1. If _T_ is a reference to an abstract type or match type alias
8080
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.
8181
1. If _T_ is a reference to an anchor of the form _p.A_ then _S_ also includes
8282
all term references on the path _p_.
@@ -107,8 +107,8 @@ which means that the alternative `c` would be chosen as solution!
107107
Scala 2's somewhat puzzling behavior with respect to ambiguity has been exploited to implement
108108
the analogue of a "negated" search in implicit resolution, where a query `Q1` fails if some
109109
other query `Q2` succeeds and `Q1` succeeds if `Q2` fails. With the new cleaned up behavior
110-
these techniques no longer work. But there is now a new special type `scala.util.Not`
111-
which implements negation directly. For any query type `Q`: `Not[Q]` succeeds if and only if
110+
these techniques no longer work. But there is now a new special type `scala.util.NotGiven`
111+
which implements negation directly. For any query type `Q`, `NotGiven[Q]` succeeds if and only if
112112
the implicit search for `Q` fails.
113113

114114
**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,

docs/docs/reference/changed-features/overload-resolution.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ overload resolution based on additional argument blocks.
4949
The handling of function values with missing parameter types has been improved. We can now
5050
pass such values in the first argument list of an overloaded application, provided
5151
that the remaining parameters suffice for picking a variant of the overloaded function.
52-
For example, the following code compiles in Scala 3, while it results in an
52+
For example, the following code compiles in Scala 3, while it results in a
5353
missing parameter type error in Scala2:
5454

5555
```scala

0 commit comments

Comments
 (0)