Skip to content

Commit

Permalink
doc: Update modules for containers
Browse files Browse the repository at this point in the history
  • Loading branch information
hjr3 committed Apr 25, 2014
1 parent eea4909 commit 87f2e21
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/doc/guide-container.md
Expand Up @@ -22,10 +22,10 @@ just unique keys without a corresponding value. The `Map` and `Set` traits in

The standard library provides three owned map/set types:

* `std::hashmap::HashMap` and `std::hashmap::HashSet`, requiring the keys to
* `collections::HashMap` and `collections::HashSet`, requiring the keys to
implement `Eq` and `Hash`
* `std::trie::TrieMap` and `std::trie::TrieSet`, requiring the keys to be `uint`
* `extra::treemap::TreeMap` and `extra::treemap::TreeSet`, requiring the keys
* `collections::TrieMap` and `collections::TrieSet`, requiring the keys to be `uint`
* `collections::TreeMap` and `collections::TreeSet`, requiring the keys
to implement `TotalOrd`

These maps do not use managed pointers so they can be sent between tasks as
Expand All @@ -42,19 +42,19 @@ implementing the `Hash` trait.

## Double-ended queues

The `extra::ringbuf` module implements a double-ended queue with `O(1)`
The `collections::ringbuf` module implements a double-ended queue with `O(1)`
amortized inserts and removals from both ends of the container. It also has
`O(1)` indexing like a vector. The contained elements are not required to be
copyable, and the queue will be sendable if the contained type is sendable.
Its interface `Deque` is defined in `extra::collections`.
Its interface `Deque` is defined in `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

The `extra::priority_queue` module implements a queue ordered by a key. The
The `collections::priority_queue` module implements a queue ordered by a key. The
contained elements are not required to be copyable, and the queue will be
sendable if the contained type is sendable.

Expand Down

5 comments on commit 87f2e21

@bors
Copy link
Contributor

@bors bors commented on 87f2e21 Apr 26, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at hjr3@87f2e21

@bors
Copy link
Contributor

@bors bors commented on 87f2e21 Apr 26, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging hjr3/rust/guide-container-update = 87f2e21 into auto

@bors
Copy link
Contributor

@bors bors commented on 87f2e21 Apr 26, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hjr3/rust/guide-container-update = 87f2e21 merged ok, testing candidate = 35f3f7a

@bors
Copy link
Contributor

@bors bors commented on 87f2e21 Apr 26, 2014

@bors
Copy link
Contributor

@bors bors commented on 87f2e21 Apr 26, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 35f3f7a

Please sign in to comment.