diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-02-03 17:55:19 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-02-03 17:56:49 -0800 |
| commit | 3b396d17d6bfc22cbea4252337b6058a5bea6ec2 (patch) | |
| tree | 0fe0198f7877ccd9580c73191c37bf352e6889c2 /src/libsyntax/util | |
| parent | 04eb9b4eb0472aa89dce1ad53d33f5e52284b128 (diff) | |
| parent | 4fd9264875c0e0ee450316e8fbf15977d8978a74 (diff) | |
| download | rust-3b396d17d6bfc22cbea4252337b6058a5bea6ec2.tar.gz rust-3b396d17d6bfc22cbea4252337b6058a5bea6ec2.zip | |
Merge remote-tracking branch 'thestinger/old_map' into incoming
Conflicts: src/test/bench/core-map.rs
Diffstat (limited to 'src/libsyntax/util')
| -rw-r--r-- | src/libsyntax/util/interner.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/util/interner.rs b/src/libsyntax/util/interner.rs index 23db470391a..19b938ccd68 100644 --- a/src/libsyntax/util/interner.rs +++ b/src/libsyntax/util/interner.rs @@ -15,13 +15,13 @@ use core::prelude::*; use core::dvec::DVec; -use std::map::HashMap; -use std::map; +use std::oldmap::HashMap; +use std::oldmap; pub type hash_interner<T> = {map: HashMap<T, uint>, vect: DVec<T>}; pub fn mk<T:Eq IterBytes Hash Const Copy>() -> Interner<T> { - let m = map::HashMap::<T, uint>(); + let m = oldmap::HashMap::<T, uint>(); let hi: hash_interner<T> = {map: m, vect: DVec()}; move ((move hi) as Interner::<T>) |