Skip to content

Commit

Permalink
doc: Small changes to ownership guide.
Browse files Browse the repository at this point in the history
Disambiguate maximally by using 'and' instead of '&' next to discussion
about references.

As a bonus, fix the spelling of the car too.
  • Loading branch information
bluss committed Dec 18, 2014
1 parent 22a9f25 commit 5806519
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/doc/guide-ownership.md
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ fn main() {
let f = Foo { x: y }; // -+ f goes into scope
// stuff // |
// |
} // -+ f & y go out of scope
} // -+ f and y go out of scope
```

Our `f` lives within the scope of `y`, so everything works. What if it didn't?
Expand All @@ -342,7 +342,7 @@ fn main() {
let y = &5i; // ---+ y goes into scope
let f = Foo { x: y }; // ---+ f goes into scope
x = &f.x; // | | error here
} // ---+ f & y go out of scope
} // ---+ f and y go out of scope
// |
println!("{}", x); // |
} // -+ x goes out of scope
Expand Down Expand Up @@ -395,7 +395,7 @@ struct Wheel {
}
fn main() {
let car = Car { name: "DeLorian".to_string() };
let car = Car { name: "DeLorean".to_string() };
for _ in range(0u, 4) {
Wheel { size: 360, owner: car };
Expand Down Expand Up @@ -431,7 +431,7 @@ struct Wheel {
}

fn main() {
let car = Car { name: "DeLorian".to_string() };
let car = Car { name: "DeLorean".to_string() };

let car_owner = Rc::new(car);

Expand Down

0 comments on commit 5806519

Please sign in to comment.