Skip to content

Commit

Permalink
auto merge of #7001 : alco/rust/tutorial-for-loop, r=bstrie
Browse files Browse the repository at this point in the history
The "4.3 Loops" section only describes `while` and `loop`. We then see `for`
used in a code sample at the end of the "13. Vectors and strings" section,
but it's explained for the first time only in the next section --
"14. Closures".

It is worth mentioning it in "4.3 Loops".

---

Feel free to reword it and commit yourself if you don't like my wording.
  • Loading branch information
bors committed Jun 8, 2013
2 parents b8cf2f8 + 83b68a2 commit 9b0986a
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions doc/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -569,8 +569,10 @@ loop {
This code prints out a weird sequence of numbers and stops as soon as
it finds one that can be divided by five.

For more involved iteration, such as enumerating the elements of a
collection, Rust uses [higher-order functions](#closures).
Rust also has a `for` construct. It's different from C's `for` and it works
best when iterating over collections. See the section on [closures](#closures)
to find out how to use `for` and higher-order functions for enumerating
elements of a collection.

# Data structures

Expand Down Expand Up @@ -1393,6 +1395,7 @@ assert!(crayons.len() == 3);
assert!(!crayons.is_empty());
// Iterate over a vector, obtaining a pointer to each element
// (`for` is explained in the next section)
for crayons.each |crayon| {
let delicious_crayon_wax = unwrap_crayon(*crayon);
eat_crayon_wax(delicious_crayon_wax);
Expand Down

0 comments on commit 9b0986a

Please sign in to comment.