---

yaml
---
r: 30567
b: refs/heads/incoming
c: da5033f
h: refs/heads/master
i:
  30565: 252a119
  30563: 44e21c8
  30559: 8f7b386
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 864cca14ee00082f67bbf92b60802195ab1c4d38
+refs/heads/incoming: da5033f99193cda3c95f5518d9591faae1ce5e6a
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/doc/tutorial-borrowed-ptr.md

@@ -70,14 +70,14 @@ fn compute_distance(p1: &point, p2: &point) -> float {
 
 Now we can call `compute_distance()` in various ways:
 
-~~~ {.xfail-test}
+~~~
 # type point = {x: float, y: float};
 # let on_the_stack : point  =  {x: 3.0, y: 4.0};
 # let shared_box   : @point = @{x: 5.0, y: 1.0};
 # let unique_box   : ~point = ~{x: 7.0, y: 9.0};
 # fn compute_distance(p1: &point, p2: &point) -> float { 0f }
-compute_distance(&on_the_stack, shared_box)
-compute_distance(shared_box, unique_box)
+compute_distance(&on_the_stack, shared_box);
+compute_distance(shared_box, unique_box);
 ~~~
 
 Here the `&` operator is used to take the address of the variable
@@ -147,21 +147,21 @@ type rectangle = {origin: point, size: size};
 Now again I can define rectangles in a few different ways:
 
 ~~~
-let rect_stack  = &{origin: {x: 1, y: 2}, size: {w: 3, h: 4}};
-let rect_shared = @{origin: {x: 3, y: 4}, size: {w: 3, h: 4}};
-let rect_unique = ~{origin: {x: 5, y: 6}, size: {w: 3, h: 4}};
+let rect_stack  = &{origin: {x: 1f, y: 2f}, size: {w: 3f, h: 4f}};
+let rect_shared = @{origin: {x: 3f, y: 4f}, size: {w: 3f, h: 4f}};
+let rect_unique = ~{origin: {x: 5f, y: 6f}, size: {w: 3f, h: 4f}};
 ~~~
 
 In each case I can use the `&` operator to extact out individual
 subcomponents. For example, I could write:
 
-~~~ {.xfail-test}
+~~~
 # type point = {x: float, y: float};
 # type size = {w: float, h: float}; // as before
 # type rectangle = {origin: point, size: size};
-# let rect_stack  = &{origin: {x: 1, y: 2}, size: {w: 3, h: 4}};
-# let rect_shared = @{origin: {x: 3, y: 4}, size: {w: 3, h: 4}};
-# let rect_unique = ~{origin: {x: 5, y: 6}, size: {w: 3, h: 4}};
+# let rect_stack  = &{origin: {x: 1f, y: 2f}, size: {w: 3f, h: 4f}};
+# let rect_shared = @{origin: {x: 3f, y: 4f}, size: {w: 3f, h: 4f}};
+# let rect_unique = ~{origin: {x: 5f, y: 6f}, size: {w: 3f, h: 4f}};
 # fn compute_distance(p1: &point, p2: &point) -> float { 0f }
 compute_distance(&rect_stack.origin, &rect_shared.origin);
 ~~~