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/parse/parser.rs | |
| 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/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 06f86f134a6..3c7250112ab 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -87,7 +87,7 @@ use core::either; use core::result::Result; use core::vec::push; use core::vec; -use std::map::HashMap; +use std::oldmap::HashMap; #[deriving_eq] enum restriction { |