From 112c8a966fbdb52ff2a535dc8e6df3a8b3cb8fb2 Mon Sep 17 00:00:00 2001 From: Alexis Beingessner Date: Thu, 30 Oct 2014 21:25:08 -0400 Subject: 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] --- src/test/bench/core-set.rs | 2 +- src/test/bench/std-smallintmap.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/test/bench') diff --git a/src/test/bench/core-set.rs b/src/test/bench/core-set.rs index 4833467922b..8151f2718e3 100644 --- a/src/test/bench/core-set.rs +++ b/src/test/bench/core-set.rs @@ -14,7 +14,7 @@ extern crate collections; extern crate rand; extern crate time; -use std::collections::bitv::BitvSet; +use std::collections::BitvSet; use std::collections::TreeSet; use std::hash::Hash; use std::collections::HashSet; diff --git a/src/test/bench/std-smallintmap.rs b/src/test/bench/std-smallintmap.rs index 2086980b016..cdcb88d87c6 100644 --- a/src/test/bench/std-smallintmap.rs +++ b/src/test/bench/std-smallintmap.rs @@ -13,17 +13,17 @@ extern crate collections; extern crate time; -use std::collections::SmallIntMap; +use std::collections::VecMap; use std::os; use std::uint; -fn append_sequential(min: uint, max: uint, map: &mut SmallIntMap) { +fn append_sequential(min: uint, max: uint, map: &mut VecMap) { for i in range(min, max) { map.insert(i, i + 22u); } } -fn check_sequential(min: uint, max: uint, map: &SmallIntMap) { +fn check_sequential(min: uint, max: uint, map: &VecMap) { for i in range(min, max) { assert_eq!(map[i], i + 22u); } @@ -45,7 +45,7 @@ fn main() { let mut appendf = 0.0; for _ in range(0u, rep) { - let mut map = SmallIntMap::new(); + let mut map = VecMap::new(); let start = time::precise_time_s(); append_sequential(0u, max, &mut map); let mid = time::precise_time_s(); -- cgit 1.4.1-3-g733a5