bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #16381 : pnkfelix/rust/fsk-rust.md-fixes, r=alexcrichton

Browse source 
rust.md: Explicitly point out how special `'static` is.

Drive-by: fix description of `&content` to point out that `&'f type` is (as of today) only for type expressions.
This commit is contained in:
bors 2014-08-13 14:16:27 +00:00
commit d917770792
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/doc/rust.md
View file

@ -1356,6 +1356,9 @@ A *static item* is a named _constant value_ stored in the global data section of
Immutable static items are stored in the read-only data section. Immutable static items are stored in the read-only data section.
The constant value bound to a static item is, like all constant values, evaluated at compile time. The constant value bound to a static item is, like all constant values, evaluated at compile time.
Static items have the `static` lifetime, which outlives all other lifetimes in a Rust program. Static items have the `static` lifetime, which outlives all other lifetimes in a Rust program.
Only values stored in the global data section (such as string constants
and static items) can have the `static` lifetime;
dynamically constructed values cannot safely be assigned the `static` lifetime.
Static items are declared with the `static` keyword. Static items are declared with the `static` keyword.
A static item must have a _constant expression_ giving its definition. A static item must have a _constant expression_ giving its definition.
@ -3621,7 +3624,10 @@ There are four varieties of pointer in Rust:
References arise by (automatic) conversion from owning pointers, managed pointers, References arise by (automatic) conversion from owning pointers, managed pointers,
or by applying the borrowing operator `&` to some other value, or by applying the borrowing operator `&` to some other value,
including [lvalues, rvalues or temporaries](#lvalues,-rvalues-and-temporaries). including [lvalues, rvalues or temporaries](#lvalues,-rvalues-and-temporaries).
References are written `&content`, or in some cases `&'f content` for some lifetime-variable `f`, A borrow expression is written `&content`.
A reference type is written `&'f type` for some lifetime-variable `f`,
or just `&type` when the lifetime can be elided;
for example `&int` means a reference to an integer. for example `&int` means a reference to an integer.
Copying a reference is a "shallow" operation: Copying a reference is a "shallow" operation:
it involves only copying the pointer itself. it involves only copying the pointer itself.