Test fixes and rebase conflicts, round 1

Author: alexcrichton

Diff for: 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;

Diff for: 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;
 

Diff for: src/libstd/dynamic_lib.rs

@@ -259,19 +259,14 @@ mod dl {
 
 #[cfg(target_os = "windows")]
 mod dl {
+    use prelude::v1::*;
+
     use ffi::OsStr;
-    use iter::Iterator;
     use libc;
     use libc::consts::os::extra::ERROR_CALL_NOT_IMPLEMENTED;
-    use ops::FnOnce;
     use sys::os;
     use os::windows::prelude::*;
-    use option::Option::{self, Some, None};
     use ptr;
-    use result::Result;
-    use result::Result::{Ok, Err};
-    use string::String;
-    use vec::Vec;
     use sys::c::compat::kernel32::SetThreadErrorMode;
 
     pub fn open(filename: Option<&OsStr>) -> Result<*mut u8, String> {

Diff for: 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};

Diff for: src/test/run-pass/task-stderr.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-expanded FIXME #23616
-
 #![feature(box_syntax, set_stdio)]
 
 use std::io::prelude::*;