Skip to content

slightly adopt and unify const generics terminology #1014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/const_eval.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ A _const context_ is one of the following:
* [constants]
* [statics]
* [enum discriminants]
* A [const generic argument]
* [Const arguments]

## Const Functions

Expand Down Expand Up @@ -98,7 +98,7 @@ Notable features that const contexts have, but const fn haven't are:
Conversely, the following are possible in a const function, but not in a const context:

* Use of generic type and lifetime parameters.
* Const contexts do allow limited use of [const generic parameters].
* Const contexts do allow limited use of [const parameters].

[arithmetic]: expressions/operator-expr.md#arithmetic-and-logical-binary-operators
[array expressions]: expressions/array-expr.md
Expand All @@ -113,8 +113,8 @@ Conversely, the following are possible in a const function, but not in a const c
[closure expressions]: expressions/closure-expr.md
[comparison]: expressions/operator-expr.md#comparison-operators
[const functions]: items/functions.md#const-functions
[const generic argument]: items/generics.md#const-generics
[const generic parameters]: items/generics.md#const-generics
[Const arguments]: items/generics.md#const-generics
[const parameters]: items/generics.md#const-generics
[constants]: items/constant-items.md
[Const parameters]: items/generics.md
[dereference operator]: expressions/operator-expr.md#the-dereference-operator
Expand Down
6 changes: 3 additions & 3 deletions src/items/generics.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ referred to with path syntax.

### Const generics

*Const generic parameters* allow items to be generic over constant values. The
*Const parameters* allow items to be generic over constant values. The
const identifier introduces a name for the constant parameter, and all
instances of the item must be instantiated with a value of the given type.

Expand All @@ -68,7 +68,7 @@ places:
5. As a part of the type of any fields in the item.

```rust
// Examples where const generic parameters can be used.
// Examples where const parameters can be used.

// Used in the signature of the item itself.
fn foo<const N: usize>(arr: [i32; N]) {
Expand Down Expand Up @@ -97,7 +97,7 @@ impl<const N: usize> Trait for Foo<N> {
```

```rust,compile_fail
// Examples where const generic parameters cannot be used.
// Examples where const parameters cannot be used.
fn foo<const N: usize>() {
// Cannot use in item definitions within a function body.
const BAD_CONST: [usize; N] = [1; N];
Expand Down