Skip to content

Commit 4686d19

Browse files
committed
Tweaks to terminology in docs
Remove inconsistencies between actual pages and overview pages and sidebar.
1 parent 06339d9 commit 4686d19

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

docs/docs/reference/features-classification.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ These new constructs directly model core features of DOT, higher-kinded types, a
2121
- [Type lambdas](https://dotty.epfl.ch/docs/reference/new-types/type-lambdas.html),
2222
replacing encodings using structural types and type projection.
2323
- [Context Queries](https://dotty.epfl.ch/docs/reference/contextual/query-types.html)
24-
(_aka_ implicit function types) offering abstraction over inferable parameters.
24+
(_aka_ implicit function types) offering abstraction over implicit parameters.
2525

2626
**Status: essential**
2727

@@ -38,7 +38,7 @@ These constructs replace existing constructs with the aim of making the language
3838
- [Trait Parameters](https://dotty.epfl.ch/docs/reference/other-new-features/trait-parameters.html) replace [early initializers](https://dotty.epfl.ch/docs/reference/dropped-features/early-initializers.html) with a more generally useful construct.
3939
- [Implied Instances](https://dotty.epfl.ch/docs/reference/contextual/instance-defs.html)
4040
replace implicit objects and defs, focussing on intent over mechanism.
41-
- [Inferable parameters](https://dotty.epfl.ch/docs/reference/contextual/inferable-params.html) replace implicit parameters, avoiding their ambiguities.
41+
- [Given Clauses](https://dotty.epfl.ch/docs/reference/contextual/inferable-params.html) replace implicit parameters, avoiding their ambiguities.
4242
- [Extension Methods](https://dotty.epfl.ch/docs/reference/contextual/extension-methods.html) replace implicit classes with a clearer and simpler mechanism.
4343
- [Opaque Type Aliases](https://dotty.epfl.ch/docs/reference/other-new-features/opaques.html) replace most uses
4444
of value classes while guaranteeing absence of boxing.
@@ -71,7 +71,7 @@ For the next several versions, old features will remain available and deprecatio
7171
These constructs are restricted to make the language safer.
7272

7373
- [Implicit Conversions](https://dotty.epfl.ch/docs/reference/contextual/conversions.html): there is only one way to define implicit conversions instead of many, and potentially surprising implicit conversions require a language import.
74-
- [Implied Imports](https://dotty.epfl.ch/docs/reference/contextual/import-implied.html): implicits now require a special form of import, to make the import clearly visible.
74+
- [Import Implied](https://dotty.epfl.ch/docs/reference/contextual/import-implied.html): implicits now require a special form of import, to make the import clearly visible.
7575
- [Type Projection](https://dotty.epfl.ch/docs/reference/dropped-features/type-projection.html): only classes can be used as prefix `C` of a type projection `C#A`. Type projection on abstract types is no longer supported since it is unsound.
7676
- [Multiversal Equality](https://dotty.epfl.ch/docs/reference/contextual/multiversal-equality.html) implements an "opt-in" scheme to rule out nonsensical comparisons with `==` and `!=`.
7777
- [@infix and @alpha](https://github.com/lampepfl/dotty/pull/5975)

docs/docs/reference/overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ These new constructs directly model core features of DOT, higher-kinded types, a
2626
- [Type lambdas](https://dotty.epfl.ch/docs/reference/new-types/type-lambdas.html),
2727
replacing encodings using structural types and type projection.
2828
- [Context Queries](https://dotty.epfl.ch/docs/reference/contextual/query-types.html)
29-
(_aka_ implicit function types) offering abstraction over inferable parameters.
29+
(_aka_ implicit function types) offering abstraction over implicit parameters.
3030

3131
## Simplifications
3232

@@ -35,7 +35,7 @@ These constructs replace existing constructs with the aim of making the language
3535
- [Trait Parameters](https://dotty.epfl.ch/docs/reference/other-new-features/trait-parameters.html) replace [early initializers](https://dotty.epfl.ch/docs/reference/dropped-features/early-initializers.html) with a more generally useful construct.
3636
- [Implied Instances](https://dotty.epfl.ch/docs/reference/contextual/instance-defs.html)
3737
replace implicit objects and defs, focussing on intent over mechanism.
38-
- [Inferable parameters](https://dotty.epfl.ch/docs/reference/contextual/inferable-params.html) replace implicit parameters, avoiding their ambiguities.
38+
- [Given Clauses](https://dotty.epfl.ch/docs/reference/contextual/inferable-params.html) replace implicit parameters, avoiding their ambiguities.
3939
- [Extension Methods](https://dotty.epfl.ch/docs/reference/contextual/extension-methods.html) replace implicit classes with a clearer and simpler mechanism.
4040
- [Opaque Type Aliases](https://dotty.epfl.ch/docs/reference/other-new-features/opaques.html) replace most uses
4141
of value classes while guaranteeing absence of boxing.
@@ -57,7 +57,7 @@ Value classes (superseded by opaque type aliases) are a special case. There are
5757
These constructs are restricted to make the language safer.
5858

5959
- [Implicit Conversions](https://dotty.epfl.ch/docs/reference/contextual/conversions.html): there is only one way to define implicit conversions instead of many, and potentially surprising implicit conversions require a language import.
60-
- [Implied Imports](https://dotty.epfl.ch/docs/reference/contextual/import-implied.html): implicits now require a special form of import, to make the import clearly visible.
60+
- [Import Implied](https://dotty.epfl.ch/docs/reference/contextual/import-implied.html): implicits now require a special form of import, to make the import clearly visible.
6161
- [Type Projection](https://dotty.epfl.ch/docs/reference/dropped-features/type-projection.html): only classes can be used as prefix `C` of a type projection `C#A`. Type projection on abstract types is no longer supported since it is unsound.
6262
- [Multiversal Equality](https://dotty.epfl.ch/docs/reference/contextual/multiversal-equality.html) implements an "opt-in" scheme to rule out nonsensical comparisons with `==` and `!=`.
6363
- [@infix and @alpha](https://github.com/lampepfl/dotty/pull/5975)

docs/sidebar.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ sidebar:
4545
url: docs/reference/contextual/motivation.html
4646
- title: Implied Instances
4747
url: docs/reference/contextual/instance-defs.html
48-
- title: Inferable Parameters
48+
- title: Given Clauses
4949
url: docs/reference/contextual/inferable-params.html
5050
- title: Context Bounds
5151
url: docs/reference/contextual/context-bounds.html
52-
- title: Implied Imports
52+
- title: Import Implied
5353
url: docs/reference/contextual/import-implied.html
5454
- title: Extension Methods
5555
url: docs/reference/contextual/extension-methods.html

0 commit comments

Comments
 (0)