From 5f895db051fa59fba2825e76488e5e8c288e853f Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Fri, 13 Mar 2020 17:06:27 +0100 Subject: [PATCH 1/2] More doc changes --- docs/docs/reference/changed-features/implicit-resolution.md | 6 +++--- docs/docs/reference/contextual/relationship-implicits.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 30f6c6415dad..655a6c35320f 100644 --- a/docs/docs/reference/changed-features/implicit-resolution.md +++ b/docs/docs/reference/changed-features/implicit-resolution.md @@ -99,9 +99,9 @@ affect implicits on the language level. buzz(1) // error: ambiguous ``` 7. The rule for picking a _most specific_ alternative among a set of overloaded or implicit - alternatives is refined to take inferable parameters into account. All else - being equal, an alternative that takes some implicit parameters is taken to be less specific - than an alternative that takes none. If both alternatives take implicit parameters, we try + alternatives is refined to take context parameters into account. All else + being equal, an alternative that takes some context parameters is taken to be less specific + than an alternative that takes none. If both alternatives take context parameters, we try to choose between them as if they were methods with regular parameters. The following paragraph in the SLS is affected by this change: diff --git a/docs/docs/reference/contextual/relationship-implicits.md b/docs/docs/reference/contextual/relationship-implicits.md index e2fba69bec65..1adecd1a51a0 100644 --- a/docs/docs/reference/contextual/relationship-implicits.md +++ b/docs/docs/reference/contextual/relationship-implicits.md @@ -50,7 +50,7 @@ final implicit def given_Context = ctx Anonymous given instances get compiler synthesized names, which are generated in a reproducible way from the implemented type(s). For example, if the names of the `IntOrd` and `ListOrd` givens above were left out, the following names would be synthesized instead: ```scala given given_Ord_Int as Ord[Int] { ... } -given given_Ord_List[T] as Ord[List[T]] { ... } +given given_Ord_List_T as Ord[List[T]] { ... } ``` The synthesized type names are formed from From aa76f943c0e06f226a03de778cad3f4a2f9ac850 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Sun, 15 Mar 2020 08:23:31 +0100 Subject: [PATCH 2/2] Update docs/docs/reference/contextual/relationship-implicits.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Sébastien Doeraene --- docs/docs/reference/contextual/relationship-implicits.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/reference/contextual/relationship-implicits.md b/docs/docs/reference/contextual/relationship-implicits.md index 1adecd1a51a0..bb4c2bc5d189 100644 --- a/docs/docs/reference/contextual/relationship-implicits.md +++ b/docs/docs/reference/contextual/relationship-implicits.md @@ -50,7 +50,7 @@ final implicit def given_Context = ctx Anonymous given instances get compiler synthesized names, which are generated in a reproducible way from the implemented type(s). For example, if the names of the `IntOrd` and `ListOrd` givens above were left out, the following names would be synthesized instead: ```scala given given_Ord_Int as Ord[Int] { ... } -given given_Ord_List_T as Ord[List[T]] { ... } +given given_Ord_List_T[T](using ord: Ord[T]) as Ord[List[T]] { ... } ``` The synthesized type names are formed from