diff options
| author | bors <bors@rust-lang.org> | 2014-06-12 14:17:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-06-12 14:17:13 +0000 |
| commit | c0a6f72e8bfea2647da7f63f9f09b2cfeaa161c9 (patch) | |
| tree | 50abeb22701f72a4cea2fa5568228690fda518c9 | |
| parent | 87bf47a0f706685b8e3acbf40585e45ec423f061 (diff) | |
| parent | 782c52a9240e7657fa813dcb141f5c5f4b308a25 (diff) | |
| download | rust-c0a6f72e8bfea2647da7f63f9f09b2cfeaa161c9.tar.gz rust-c0a6f72e8bfea2647da7f63f9f09b2cfeaa161c9.zip | |
auto merge of #14805 : zzmp/rust/patch-1, r=alexcrichton
The guide previously stated: > The compiler will automatically convert a box box point to a reference like &point. This fixes the doubled word `box`, so the statement reads > The compiler will automatically convert a box point to a reference like &point. The code it is referring to is `compute_distance(&on_the_stack, on_the_heap);`, so a single `box` is appropriate.
| -rw-r--r-- | src/doc/guide-lifetimes.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/guide-lifetimes.md b/src/doc/guide-lifetimes.md index 65f37031674..55bea362e9b 100644 --- a/src/doc/guide-lifetimes.md +++ b/src/doc/guide-lifetimes.md @@ -78,7 +78,7 @@ value. We also call this _borrowing_ the local variable name for the same data. In the case of `on_the_heap`, however, no explicit action is necessary. -The compiler will automatically convert a box box point to a reference like &point. +The compiler will automatically convert a box point to a reference like &point. This is another form of borrowing; in this case, the contents of the owned box are being lent out. |