bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename variable in tutorial

Browse source 
Renamed `owned_box` to `on_the_heap` to use a consistent
naming across the tutorial and the life time guide.
Also it makes the example easier to grasp.
This commit is contained in:
Christoph Burgdorf 2014-05-31 23:33:03 +02:00
parent 60b4a97de7
commit b657af8946
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/doc/tutorial.md
View file

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