Test fixes and rebase conflicts, round 2

src/libstd/sys/windows/fs.rs

@@ -135,13 +135,6 @@ impl FileDesc {
             _ => Err(super::last_error()),
         }
     }
-
-    /// Extract the actual filedescriptor without closing it.
-    pub fn unwrap(self) -> fd_t {
-        let fd = self.fd;
-        unsafe { mem::forget(self) };
-        fd
-    }
 }
 
 impl Drop for FileDesc {

src/libstd/sys/windows/process.rs

@@ -24,7 +24,6 @@ use old_io::process::{ProcessExit, ExitStatus};
 use old_io::{IoResult, IoError};
 use old_io;
 use fs::PathExt;
-use os;
 use old_path::{BytesContainer, GenericPath};
 use ptr;
 use str;