diff options
| author | Kevin Ballard <kevin@sb.org> | 2014-05-04 20:54:02 -0700 |
|---|---|---|
| committer | Kevin Ballard <kevin@sb.org> | 2014-05-08 12:06:22 -0700 |
| commit | eab6bb2ece0427d2ec165e510f2abaa84b857900 (patch) | |
| tree | 09b066f570f067fe927c0cb7cb8b7addf09156c4 /src/doc/tutorial.md | |
| parent | 752048a27135bdf15c6f00229b04cea7ceeaf739 (diff) | |
| download | rust-eab6bb2ece0427d2ec165e510f2abaa84b857900.tar.gz rust-eab6bb2ece0427d2ec165e510f2abaa84b857900.zip | |
Handle fallout in documentation
Tweak the tutorial's section on vectors and strings, to slightly clarify the difference between fixed-size vectors, vectors, and slices.
Diffstat (limited to 'src/doc/tutorial.md')
| -rw-r--r-- | src/doc/tutorial.md | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/doc/tutorial.md b/src/doc/tutorial.md index 56f9e8e5cbd..9b9153fe579 100644 --- a/src/doc/tutorial.md +++ b/src/doc/tutorial.md @@ -1588,8 +1588,8 @@ let mut numbers = vec![1, 2, 3]; numbers.push(4); numbers.push(5); -// The type of a unique vector is written as `~[int]` -let more_numbers: ~[int] = numbers.move_iter().collect(); +// The type of a unique vector is written as `Vec<int>` +let more_numbers: Vec<int> = numbers.move_iter().map(|i| i+1).collect(); // The original `numbers` value can no longer be used, due to move semantics. @@ -1633,7 +1633,7 @@ view[0] = 5; let ys: &mut [int] = &mut [1, 2, 3]; ~~~ -Square brackets denote indexing into a vector: +Square brackets denote indexing into a slice or fixed-size vector: ~~~~ # enum Crayon { Almond, AntiqueBrass, Apricot, @@ -1647,7 +1647,7 @@ match crayons[0] { } ~~~~ -A vector can be destructured using pattern matching: +A slice or fixed-size vector can be destructured using pattern matching: ~~~~ let numbers: &[int] = &[1, 2, 3]; @@ -1660,9 +1660,10 @@ let score = match numbers { ~~~~ Both vectors and strings support a number of useful [methods](#methods), -defined in [`std::vec`] and [`std::str`]. +defined in [`std::vec`], [`std::slice`], and [`std::str`]. [`std::vec`]: std/vec/index.html +[`std::slice`]: std/slice/index.html [`std::str`]: std/str/index.html # Ownership escape hatches |
