Skip to content

Commit 2a4a19e

Browse files
committed
Implied Conversion -> Implicit Conversion
Implied felt forced in this context
1 parent b5bd2b9 commit 2a4a19e

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

docs/docs/reference/contextual/conversions.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
---
22
layout: doc-page
3-
title: "Inferable Conversions"
3+
title: "Implicit Conversions"
44
---
55

6-
Inferable conversions are defined by implied instances of the `scala.Conversion` class.
6+
Implicit conversions are defined by implied instances of the `scala.Conversion` class.
77
This class is defined in package `scala` as follows:
88
```scala
99
abstract class Conversion[-T, +U] extends (T => U)
1010
```
11-
For example, here is an inferable conversion from `String` to `Token`:
11+
For example, here is an implicit conversion from `String` to `Token`:
1212
```scala
1313
implied for Conversion[String, Token] {
1414
def apply(str: String): Token = new KeyWord(str)
1515
}
1616
```
17-
An inferable conversion is applied automatically by the compiler in three situations:
17+
An implicit conversion is applied automatically by the compiler in three situations:
1818

1919
1. If an expression `e` has type `T`, and `T` does not conform to the expression's expected type `S`.
2020
2. In a selection `e.m` with `e` of type `T`, but `T` defines no member `m`.

docs/docs/reference/contextual/query-types.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ layout: doc-page
33
title: "Context Queries"
44
---
55

6-
_Context queries_ are functions with inferable parameters.
6+
_Context queries_ are functions with (only) inferable parameters.
77
_Context query types_ are the types of first-class context queries.
88
Here is an example for a context query type:
99
```scala
@@ -26,7 +26,7 @@ context query literal, `E` is converted to a context query literal by rewriting
2626
given (x_1: T1, ..., x_n: Tn) => E
2727
```
2828
where the names `x_1`, ..., `x_n` are arbitrary. This expansion is performed
29-
before the expression `E` is typechecked, which means that x_1`, ..., `x_n`
29+
before the expression `E` is typechecked, which means that `x_1`, ..., `x_n`
3030
are available as implied instances in `E`.
3131

3232
Like query types, query literals are written with a `given` prefix. They differ from normal function literals in two ways:

docs/sidebar.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ sidebar:
5454
url: docs/reference/derivation.html
5555
- title: Context Queries
5656
url: docs/reference/contextual/query-types.html
57-
- title: Implied Conversions
57+
- title: Implicit Conversions
5858
url: docs/reference/contextual/conversions.html
5959
- title: Inferable By-Name Parameters
6060
url: docs/reference/contextual/inferable-by-name-parameters.html

0 commit comments

Comments
 (0)