Skip to content

Commit 8fe1f82

Browse files
committed
Update for review comments.
1 parent f1c75b7 commit 8fe1f82

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/glossary.md

+10-5
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ at run time by the program. It occupies a contiguous region of memory.
2626
### Associated item
2727

2828
An associated item is an item that is associated with another item. Associated
29-
items are defined in [implementations] and declared in [traits]. Only functions,
30-
constants, and type aliases can be associated.
29+
items are defined in [implementations] and declared in [traits]. Only
30+
functions, constants, and type aliases can be associated. Contrast to a [free
31+
item].
3132

3233
### Bound
3334

@@ -59,13 +60,14 @@ and functions that evaluate to a single value, with or without side-effects.
5960

6061
For example, `2 + (3 * 4)` is an expression that returns the value 14.
6162

62-
### Free function
63+
### Free item
6364

64-
A [function] that is not a member of an [implementation].
65+
An [item] that is not a member of an [implementation], such as a *free
66+
function* or a *free const*. Contrast to an [associated item].
6567

6668
### Inherent implementation
6769

68-
An [implementation] that applies to a nominal type, not to a trait.
70+
An [implementation] that applies to a nominal type, not to a trait-type pair.
6971
[More][inherent implementation].
7072

7173
### Inherent method
@@ -158,11 +160,14 @@ or unintended computation; or platform-specific results.
158160
[More][undefined-behavior].
159161

160162
[alignment]: type-layout.html#size-and-alignment
163+
[associated item]: #associated-item
161164
[enums]: items/enumerations.html
165+
[free item]: #free-item
162166
[function]: items/functions.html
163167
[implementation]: items/implementations.html
164168
[implementations]: items/implementations.html
165169
[inherent implementation]: items/implementations.html#inherent-implementations
170+
[item]: items.html
166171
[method]: items/associated-items.html#methods
167172
[object safety]: items/traits.html#object-safety
168173
[structs]: items/structs.html

0 commit comments

Comments
 (0)