Test fixes and rebase conflicts, round 2

2 files changed, 0 insertions, 8 deletions

diff --git a/src/libstd/sys/windows/fs.rs b/src/libstd/sys/windows/fs.rs
index 3330130c770..f534a33d8cc 100644
--- a/src/libstd/sys/windows/fs.rs
+++ b/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 {
diff --git a/src/libstd/sys/windows/process.rs b/src/libstd/sys/windows/process.rs
index 2065df4fbe3..414083bc41f 100644
--- a/src/libstd/sys/windows/process.rs
+++ b/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;