diff options
| author | Alexis Beingessner <a.beingessner@gmail.com> | 2014-10-30 21:25:08 -0400 |
|---|---|---|
| committer | Alexis Beingessner <a.beingessner@gmail.com> | 2014-11-02 18:58:11 -0500 |
| commit | 112c8a966fbdb52ff2a535dc8e6df3a8b3cb8fb2 (patch) | |
| tree | d6e5669ac5c4028c8776633dfbfac373852d94d6 /src/doc/reference.md | |
| parent | a294b35060e069007ee46e190a6f0a19fa3eaab8 (diff) | |
| download | rust-112c8a966fbdb52ff2a535dc8e6df3a8b3cb8fb2.tar.gz rust-112c8a966fbdb52ff2a535dc8e6df3a8b3cb8fb2.zip | |
refactor libcollections as part of collection reform
* Moves multi-collection files into their own directory, and splits them into seperate files
* Changes exports so that each collection has its own module
* Adds underscores to public modules and filenames to match standard naming conventions
(that is, treemap::{TreeMap, TreeSet} => tree_map::TreeMap, tree_set::TreeSet)
* Renames PriorityQueue to BinaryHeap
* Renames SmallIntMap to VecMap
* Miscellanious fallout fixes
[breaking-change]
Diffstat (limited to 'src/doc/reference.md')
| -rw-r--r-- | src/doc/reference.md | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/doc/reference.md b/src/doc/reference.md index 084309e9978..704311b37d9 100644 --- a/src/doc/reference.md +++ b/src/doc/reference.md @@ -944,10 +944,10 @@ An example of `use` declarations: ``` use std::iter::range_step; use std::option::{Some, None}; -use std::collections::hashmap::{mod, HashMap}; +use std::collections::hash_map::{mod, HashMap}; -# fn foo<T>(_: T){} -# fn bar(map: HashMap<String, uint>, set: hashmap::HashSet<String>){} +fn foo<T>(_: T){} +fn bar(map1: HashMap<String, uint>, map2: hash_map::HashMap<String, uint>){} fn main() { // Equivalent to 'std::iter::range_step(0u, 10u, 2u);' @@ -957,10 +957,10 @@ fn main() { // std::option::None]);' foo(vec![Some(1.0f64), None]); - // Both `hash` and `HashMap` are in scope. - let map = HashMap::new(); - let set = hashmap::HashSet::new(); - bar(map, set); + // Both `hash_map` and `HashMap` are in scope. + let map1 = HashMap::new(); + let map2 = hash_map::HashMap::new(); + bar(map1, map2); } ``` @@ -4096,7 +4096,7 @@ cause transitions between the states. The lifecycle states of a task are: * running * blocked -* panicked +* panicked * dead A task begins its lifecycle — once it has been spawned — in the |
