rollup merge of #17355 : gamazeps/issue17210

[rust.git] / src / test / bench / std-smallintmap.rs

diff --git a/src/test/bench/std-smallintmap.rs b/src/test/bench/std-smallintmap.rs
index 3b26de9cf47be2a0a4465ddf54910aa38b6e90b8..ba1bce2f834f9aabc828c20a2873c39649621945 100644 (file)
--- a/src/test/bench/std-smallintmap.rs
+++ b/src/test/bench/std-smallintmap.rs
@@ -12,8 +12,9 @@
 
 extern crate collections;
 extern crate time;
+extern crate debug;
 
-use collections::SmallIntMap;
+use std::collections::SmallIntMap;
 use std::os;
 use std::uint;
 
@@ -32,11 +33,11 @@ fn check_sequential(min: uint, max: uint, map: &SmallIntMap<uint>) {
 fn main() {
     let args = os::args();
     let args = if os::getenv("RUST_BENCH").is_some() {
-        vec!("".to_owned(), "100000".to_owned(), "100".to_owned())
+        vec!("".to_string(), "100000".to_string(), "100".to_string())
     } else if args.len() <= 1u {
-        vec!("".to_owned(), "10000".to_owned(), "50".to_owned())
+        vec!("".to_string(), "10000".to_string(), "50".to_string())
     } else {
-        args.move_iter().collect()
+        args.into_iter().collect()
     };
     let max = from_str::<uint>(args.get(1).as_slice()).unwrap();
     let rep = from_str::<uint>(args.get(2).as_slice()).unwrap();