diff options
| author | bors <bors@rust-lang.org> | 2014-07-17 22:16:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-07-17 22:16:23 +0000 |
| commit | e288fc6a996562c5e4aca46e22c1da46eb3d086b (patch) | |
| tree | 2f26793e5416aa2cef3b93760807543c0c6398d2 /src/doc/guide-pointers.md | |
| parent | 36d6acc4eea7e305058511c3fda19d459095b7f8 (diff) | |
| parent | de70d76373e05fcf0f421cedb185b08de10a714c (diff) | |
| download | rust-e288fc6a996562c5e4aca46e22c1da46eb3d086b.tar.gz rust-e288fc6a996562c5e4aca46e22c1da46eb3d086b.zip | |
auto merge of #15515 : pcwalton/rust/cross-borrowing, r=alexcrichton
except where trait objects are involved.
Part of issue #15349, though I'm leaving it open for trait objects.
Cross borrowing for trait objects remains because it is needed until we
have DST.
This will break code like:
fn foo(x: &int) { ... }
let a = box 3i;
foo(a);
Change this code to:
fn foo(x: &int) { ... }
let a = box 3i;
foo(&*a);
[breaking-change]
r? @alexcrichton
Diffstat (limited to 'src/doc/guide-pointers.md')
| -rw-r--r-- | src/doc/guide-pointers.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/guide-pointers.md b/src/doc/guide-pointers.md index 08652822097..17a1114be55 100644 --- a/src/doc/guide-pointers.md +++ b/src/doc/guide-pointers.md @@ -279,7 +279,7 @@ fn main() { let origin = &Point { x: 0.0, y: 0.0 }; let p1 = box Point { x: 5.0, y: 3.0 }; - println!("{}", compute_distance(origin, p1)); + println!("{}", compute_distance(origin, &*p1)); } ~~~ |
