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/libstd/std.rc | |
| 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/libstd/std.rc')
| -rw-r--r-- | src/libstd/std.rc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/std.rc b/src/libstd/std.rc index dc73b430099..65122bea750 100644 --- a/src/libstd/std.rc +++ b/src/libstd/std.rc @@ -79,7 +79,7 @@ pub mod bitv; pub mod deque; pub mod fun_treemap; pub mod list; -pub mod map; +pub mod oldmap; pub mod priority_queue; pub mod rope; pub mod smallintmap; |