Skip to content

Commit 5e24f08

Browse files
authored
Change "allocated object" to "allocation".
This matches the change in <rust-lang/rust#141224>
1 parent 1f45bd4 commit 5e24f08

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/behavior-considered-undefined.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ r[undefined.asm]
7979
r[undefined.const-transmute-ptr2int]
8080
* **In [const context](const_eval.md#const-context)**: transmuting or otherwise
8181
reinterpreting a pointer (reference, raw pointer, or function pointer) into
82-
some allocated object as a non-pointer type (such as integers).
82+
some allocation as a non-pointer type (such as integers).
8383
'Reinterpreting' refers to loading the pointer value at integer type without a
8484
cast, e.g. by doing raw pointer casts or using a union.
8585

src/items/static-items.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ StaticItem ->
1010
[^extern-safety]: The `safe` and `unsafe` function qualifiers are only allowed semantically within `extern` blocks.
1111

1212
r[items.static.intro]
13-
A *static item* is similar to a [constant], except that it represents an allocated object in the
13+
A *static item* is similar to a [constant], except that it represents an allocation in the
1414
program that is initialized with the initializer expression. All references and raw pointers to the
15-
static refer to the same allocated object.
15+
static refer to the same allocation.
1616

1717
r[items.static.lifetime]
1818
Static items have the `static` lifetime, which outlives all other lifetimes in a Rust program.
1919
Static items do not call [`drop`] at the end of the program.
2020

2121
r[items.static.storage-disjointness]
22-
If the `static` has a size of at least 1 byte, this allocated object is disjoint from all other such
23-
`static` objects as well as heap allocations and stack-allocated variables. However, the storage of
24-
immutable `static` items can overlap with objects that do not themselves have a unique address, such
22+
If the `static` has a size of at least 1 byte, this allocation is disjoint from all other such
23+
`static` allocations as well as heap allocations and stack-allocated variables. However, the storage of
24+
immutable `static` items can overlap with allocations that do not themselves have a unique address, such
2525
as [promoteds] and [`const` items][constant].
2626

2727
r[items.static.namespace]

0 commit comments

Comments
 (0)