doc: Update container tutorial with new names of methods and macros

`deque` -> `ringbuf`, mention `extra::dlist`.

fix reference to vector method `bsearch`. Also convert all output
in example code to use `print!`/`println!`
This commit is contained in:
blake2-ppc 2013-09-19 05:06:03 +02:00 committed by Daniel Micay
parent d12e0305b1
commit bf0e2a6f57
1 changed files with 27 additions and 22 deletions

View File

@ -11,7 +11,7 @@ are the most common container in Rust, and are flexible enough to fit many use
cases. cases.
Vectors can also be sorted and used as efficient lookup tables with the Vectors can also be sorted and used as efficient lookup tables with the
`std::vec::bsearch` function, if all the elements are inserted at one time and `bsearch()` method, if all the elements are inserted at one time and
deletions are unnecessary. deletions are unnecessary.
## Maps and sets ## Maps and sets
@ -42,10 +42,15 @@ implementing the `IterBytes` trait.
## Double-ended queues ## Double-ended queues
The `extra::deque` module implements a double-ended queue with `O(1)` amortized The `extra::ringbuf` module implements a double-ended queue with `O(1)`
inserts and removals from both ends of the container. It also has `O(1)` amortized inserts and removals from both ends of the container. It also has
indexing like a vector. The contained elements are not required to be copyable, `O(1)` indexing like a vector. The contained elements are not required to be
and the queue will be sendable if the contained type is sendable. copyable, and the queue will be sendable if the contained type is sendable.
Its interface `Deque` is defined in `extra::collections`.
The `extra::dlist` module implements a double-ended linked list, also
implementing the `Deque` trait, with `O(1)` removals and inserts at either end,
and `O(1)` concatenation.
## Priority queues ## Priority queues
@ -197,11 +202,11 @@ The function `range` (or `range_inclusive`) allows to simply iterate through a g
~~~ ~~~
for i in range(0, 5) { for i in range(0, 5) {
printf!("%d ", i) // prints "0 1 2 3 4" print!("{} ", i) // prints "0 1 2 3 4"
} }
for i in std::iter::range_inclusive(0, 5) { // needs explicit import for i in std::iter::range_inclusive(0, 5) { // needs explicit import
printf!("%d ", i) // prints "0 1 2 3 4 5" print!("{} ", i) // prints "0 1 2 3 4 5"
} }
~~~ ~~~
@ -233,7 +238,7 @@ let mut it = xs.iter().zip(ys.iter());
// print out the pairs of elements up to (&3, &"baz") // print out the pairs of elements up to (&3, &"baz")
for (x, y) in it { for (x, y) in it {
printfln!("%d %s", *x, *y); println!("{} {}", *x, *y);
if *x == 3 { if *x == 3 {
break; break;
@ -241,7 +246,7 @@ for (x, y) in it {
} }
// yield and print the last pair from the iterator // yield and print the last pair from the iterator
printfln!("last: %?", it.next()); println!("last: {:?}", it.next());
// the iterator is now fully consumed // the iterator is now fully consumed
assert!(it.next().is_none()); assert!(it.next().is_none());
@ -335,13 +340,13 @@ another `DoubleEndedIterator` with `next` and `next_back` exchanged.
~~~ ~~~
let xs = [1, 2, 3, 4, 5, 6]; let xs = [1, 2, 3, 4, 5, 6];
let mut it = xs.iter(); let mut it = xs.iter();
printfln!("%?", it.next()); // prints `Some(&1)` println!("{:?}", it.next()); // prints `Some(&1)`
printfln!("%?", it.next()); // prints `Some(&2)` println!("{:?}", it.next()); // prints `Some(&2)`
printfln!("%?", it.next_back()); // prints `Some(&6)` println!("{:?}", it.next_back()); // prints `Some(&6)`
// prints `5`, `4` and `3` // prints `5`, `4` and `3`
for &x in it.invert() { for &x in it.invert() {
printfln!("%?", x) println!("{}", x)
} }
~~~ ~~~
@ -356,11 +361,11 @@ let xs = [1, 2, 3, 4];
let ys = [5, 6, 7, 8]; let ys = [5, 6, 7, 8];
let mut it = xs.iter().chain(ys.iter()).map(|&x| x * 2); let mut it = xs.iter().chain(ys.iter()).map(|&x| x * 2);
printfln!("%?", it.next()); // prints `Some(2)` println!("{:?}", it.next()); // prints `Some(2)`
// prints `16`, `14`, `12`, `10`, `8`, `6`, `4` // prints `16`, `14`, `12`, `10`, `8`, `6`, `4`
for x in it.invert() { for x in it.invert() {
printfln!("%?", x); println!("{}", x);
} }
~~~ ~~~
@ -387,17 +392,17 @@ underlying iterators are.
let xs = [1, 2, 3, 4, 5]; let xs = [1, 2, 3, 4, 5];
let ys = ~[7, 9, 11]; let ys = ~[7, 9, 11];
let mut it = xs.iter().chain(ys.iter()); let mut it = xs.iter().chain(ys.iter());
printfln!("%?", it.idx(0)); // prints `Some(&1)` println!("{:?}", it.idx(0)); // prints `Some(&1)`
printfln!("%?", it.idx(5)); // prints `Some(&7)` println!("{:?}", it.idx(5)); // prints `Some(&7)`
printfln!("%?", it.idx(7)); // prints `Some(&11)` println!("{:?}", it.idx(7)); // prints `Some(&11)`
printfln!("%?", it.idx(8)); // prints `None` println!("{:?}", it.idx(8)); // prints `None`
// yield two elements from the beginning, and one from the end // yield two elements from the beginning, and one from the end
it.next(); it.next();
it.next(); it.next();
it.next_back(); it.next_back();
printfln!("%?", it.idx(0)); // prints `Some(&3)` println!("{:?}", it.idx(0)); // prints `Some(&3)`
printfln!("%?", it.idx(4)); // prints `Some(&9)` println!("{:?}", it.idx(4)); // prints `Some(&9)`
printfln!("%?", it.idx(6)); // prints `None` println!("{:?}", it.idx(6)); // prints `None`
~~~ ~~~