rollup merge of #20070: aturon/stab-2-clone

[rust.git] / src / libcollections / bit.rs

diff --git a/src/libcollections/bit.rs b/src/libcollections/bit.rs
index 2025af1286bb36bc5d135e7129e1f47dd8b1551d..17dbf8a2cae9ecf6e6e096a6e7595b10903b2610 100644 (file)
--- a/src/libcollections/bit.rs
+++ b/src/libcollections/bit.rs
@@ -1687,16 +1687,15 @@ fn size_hint(&self) -> (uint, Option<uint>) {
 
 #[cfg(test)]
 mod tests {
-    use std::prelude::*;
-    use std::iter::range_step;
+    use prelude::*;
+    use core::iter::range_step;
+    use core::u32;
     use std::rand;
     use std::rand::Rng;
-    use std::u32;
     use test::{Bencher, black_box};
 
     use super::{Bitv, BitvSet, from_fn, from_bytes};
     use bitv;
-    use vec::Vec;
 
     static BENCH_BITS : uint = 1 << 14;
 
@@ -2039,7 +2038,7 @@ fn test_equal_sneaky_big() {
     #[test]
     fn test_from_bytes() {
         let bitv = from_bytes(&[0b10110110, 0b00000000, 0b11111111]);
-        let str = format!("{}{}{}", "10110110", "00000000", "11111111");
+        let str = concat!("10110110", "00000000", "11111111");
         assert_eq!(bitv.to_string(), str);
     }