---

yaml
---
r: 152182
b: refs/heads/try2
c: ade5a9d
h: refs/heads/master
v: v3

Author: cburgdorf

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 3712551bc484c706a1018ece6a394736f6720f41
+refs/heads/try2: ade5a9d2fe6cb9cd7929469100172c693cd2dafe
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/doc/guide-lifetimes.md

@@ -67,7 +67,7 @@ Now we can call `compute_distance()`:
 # let on_the_stack :     Point  =     Point{x: 3.0, y: 4.0};
 # let on_the_heap  : Box<Point> = box Point{x: 7.0, y: 9.0};
 # fn compute_distance(p1: &Point, p2: &Point) -> f64 { 0.0 }
-compute_distance(&on_the_stack, &*on_the_heap);
+compute_distance(&on_the_stack, on_the_heap);
 ~~~
 
 Here, the `&` operator takes the address of the variable
@@ -77,9 +77,10 @@ value. We also call this _borrowing_ the local variable
 `on_the_stack`, because we have created an alias: that is, another
 name for the same data.
 
-For the second argument, we need to extract the contents of `on_the_heap`
-by derefercing with the `*` symbol. Now that we have the data, we need
-to create a reference with the `&` symbol.
+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. 
+This is another form of borrowing; in this case, the contents of the owned box 
+are being lent out.
 
 Whenever a caller lends data to a callee, there are some limitations on what
 the caller can do with the original. For example, if the contents of a

branches/try2/src/doc/tutorial.md

@@ -1429,7 +1429,7 @@ contains a point, but allocated in a different location:
 ~~~
 # struct Point { x: f64, y: f64 }
 let on_the_stack :     Point  =     Point { x: 3.0, y: 4.0 };
-let on_the_heap  : Box<Point> = box Point { x: 7.0, y: 9.0 };
+let owned_box    : Box<Point> = box Point { x: 7.0, y: 9.0 };
 ~~~
 
 Suppose we want to write a procedure that computes the distance
@@ -1454,9 +1454,9 @@ Now we can call `compute_distance()` in various ways:
 ~~~
 # struct Point{ x: f64, y: f64 };
 # let on_the_stack :     Point  =     Point { x: 3.0, y: 4.0 };
-# let on_the_heap  : Box<Point> = box Point { x: 7.0, y: 9.0 };
+# let owned_box    : Box<Point> = box Point { x: 7.0, y: 9.0 };
 # fn compute_distance(p1: &Point, p2: &Point) -> f64 { 0.0 }
-compute_distance(&on_the_stack, on_the_heap);
+compute_distance(&on_the_stack, owned_box);
 ~~~
 
 Here the `&` operator is used to take the address of the variable