dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4614 from thestinger/map 

remove the old LinearMap constructor
This commit is contained in:
Tim Chevalier 2013-01-24 11:07:39 -08:00
parent 5b64c796a4 dbfe21edda
commit 8b2e7fc529
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libcore/hashmap.rs
View File

@ -60,10 +60,6 @@ pub mod linear {
((capacity as float) * 3. / 4.) as uint
}
pub fn LinearMap<K:Eq Hash,V>() -> LinearMap<K,V> {
linear_map_with_capacity(INITIAL_CAPACITY)
}
pub fn linear_map_with_capacity<K:Eq Hash,V>(
initial_capacity: uint) -> LinearMap<K,V> {
let r = rand::Rng();
@ -351,7 +347,8 @@ pub mod linear {
}
}
impl<K:Hash IterBytes Eq,V> LinearMap<K,V> {
pub impl<K:Hash IterBytes Eq,V> LinearMap<K,V> {
/// Create an empty LinearMap
static fn new() -> LinearMap<K, V> {
linear_map_with_capacity(INITIAL_CAPACITY)
}
@ -495,7 +492,7 @@ pub mod linear {
pub impl <T: Hash IterBytes Eq> LinearSet<T> {
/// Create an empty LinearSet
static fn new() -> LinearSet<T> { LinearSet{map: LinearMap()} }
static fn new() -> LinearSet<T> { LinearSet{map: LinearMap::new()} }
}
}

4
src/libstd/workcache.rs
View File

@ -259,7 +259,7 @@ impl Context {
static fn new(db: @Mut<Database>,
lg: @Mut<Logger>,
cfg: @json::Object) -> Context {
Context {db: db, logger: lg, cfg: cfg, freshness: LinearMap()}
Context{db: db, logger: lg, cfg: cfg, freshness: LinearMap::new()}
}
fn prep<T:Owned
@ -270,7 +270,7 @@ impl Context {
blk: fn(@Mut<Prep>)->Work<T>) -> Work<T> {
let p = @Mut(Prep {ctxt: self,
fn_name: fn_name.to_owned(),
declared_inputs: LinearMap()});
declared_inputs: LinearMap::new()});
blk(p)
}
}