Skip to content

Commit 112c8a9

Browse files
committed
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]
1 parent a294b35 commit 112c8a9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1797
-1706
lines changed

src/doc/reference.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -944,10 +944,10 @@ An example of `use` declarations:
944944
```
945945
use std::iter::range_step;
946946
use std::option::{Some, None};
947-
use std::collections::hashmap::{mod, HashMap};
947+
use std::collections::hash_map::{mod, HashMap};
948948
949-
# fn foo<T>(_: T){}
950-
# fn bar(map: HashMap<String, uint>, set: hashmap::HashSet<String>){}
949+
fn foo<T>(_: T){}
950+
fn bar(map1: HashMap<String, uint>, map2: hash_map::HashMap<String, uint>){}
951951
952952
fn main() {
953953
// Equivalent to 'std::iter::range_step(0u, 10u, 2u);'
@@ -957,10 +957,10 @@ fn main() {
957957
// std::option::None]);'
958958
foo(vec![Some(1.0f64), None]);
959959
960-
// Both `hash` and `HashMap` are in scope.
961-
let map = HashMap::new();
962-
let set = hashmap::HashSet::new();
963-
bar(map, set);
960+
// Both `hash_map` and `HashMap` are in scope.
961+
let map1 = HashMap::new();
962+
let map2 = hash_map::HashMap::new();
963+
bar(map1, map2);
964964
}
965965
```
966966

@@ -4096,7 +4096,7 @@ cause transitions between the states. The lifecycle states of a task are:
40964096

40974097
* running
40984098
* blocked
4099-
* panicked
4099+
* panicked
41004100
* dead
41014101

41024102
A task begins its lifecycle &mdash; once it has been spawned &mdash; in the

0 commit comments

Comments
 (0)