Test fixes and rebase conflicts, round 1

src/libcollections/string.rs

@@ -21,7 +21,6 @@ use core::mem;
 use core::ops::{self, Deref, Add, Index};
 use core::ptr;
 use core::slice;
-#[allow(deprecated)] use core::str::Str;
 use core::str::pattern::Pattern;
 use rustc_unicode::str as unicode_str;
 use rustc_unicode::str::Utf16Item;

src/libcollections/vec.rs

@@ -63,7 +63,7 @@ use core::ops::{Index, IndexMut, Deref, Add};
 use core::ops;
 use core::ptr;
 use core::ptr::Unique;
-use core::slice::{self, AsSlice};
+use core::slice;
 use core::isize;
 use core::usize;
 

src/libstd/sys/windows/fs2.rs

@@ -12,7 +12,6 @@ use core::prelude::*;
 use io::prelude::*;
 use os::windows::prelude::*;
 
-use default::Default;
 use ffi::OsString;
 use fmt;
 use io::{self, Error, SeekFrom};