[libcollections] Fix unused import warnings during stage0 build

Author: wesleywiser

src/libcollections/lib.rs

@@ -37,11 +37,10 @@
 #![feature(unsafe_no_drop_flag, filling_drop)]
 #![feature(step_by)]
 #![feature(str_char)]
-#![feature(str_words)]
+#![cfg_attr(not(test), feature(str_words))]
 #![feature(slice_patterns)]
 #![feature(utf8_error)]
-#![cfg_attr(test, feature(rand, rustc_private, test, hash, collections,
-                          collections_drain, collections_range))]
+#![cfg_attr(test, feature(rand, test))]
 #![cfg_attr(test, allow(deprecated))] // rand
 
 #![feature(no_std)]

src/libcollections/slice.rs

@@ -79,18 +79,25 @@
 #![doc(primitive = "slice")]
 #![stable(feature = "rust1", since = "1.0.0")]
 
+#[cfg(not(test))]
 use alloc::boxed::Box;
 use core::clone::Clone;
 use core::cmp::Ordering::{self, Greater, Less};
-use core::cmp::{self, Ord, PartialEq};
+use core::cmp;
+#[cfg(not(test))]
+use core::cmp::Ord;
+#[cfg(not(test))]
+use core::cmp::PartialEq;
 use core::iter::Iterator;
 use core::marker::Sized;
 use core::mem::size_of;
 use core::mem;
 use core::ops::FnMut;
 use core::option::Option::{self, Some, None};
 use core::ptr;
+#[cfg(not(test))]
 use core::result::Result;
+#[cfg(not(test))]
 use core::slice as core_slice;
 use self::Direction::*;
 

src/libcollections/str.rs

@@ -51,13 +51,22 @@ use self::RecompositionState::*;
 use self::DecompositionType::*;
 
 use core::clone::Clone;
-use core::iter::{Iterator, Extend};
+use core::iter::Iterator;
+#[cfg(not(test))]
+use core::iter::Extend;
 use core::option::Option::{self, Some, None};
+#[cfg(not(test))]
 use core::result::Result;
+#[cfg(not(test))]
 use core::str as core_str;
+#[cfg(not(test))]
 use core::str::pattern::Pattern;
-use core::str::pattern::{Searcher, ReverseSearcher, DoubleEndedSearcher};
-use rustc_unicode::str::{UnicodeStr, Utf16Encoder};
+use core::str::pattern::Searcher;
+#[cfg(not(test))]
+use core::str::pattern::{ReverseSearcher, DoubleEndedSearcher};
+use rustc_unicode::str::Utf16Encoder;
+#[cfg(not(test))]
+use rustc_unicode::str::UnicodeStr;
 
 use vec_deque::VecDeque;
 use borrow::{Borrow, ToOwned};

src/libcollections/vec_deque.rs

@@ -1801,7 +1801,7 @@ impl<T: fmt::Debug> fmt::Debug for VecDeque<T> {
 
 #[cfg(test)]
 mod tests {
-    use core::iter::{Iterator, self};
+    use core::iter::Iterator;
     use core::option::Option::Some;
 
     use test;