user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Test fixes and rebase conflicts, round 2

Browse source
This commit is contained in:
Alex Crichton 2015-03-31 11:41:18 -07:00
parent 554946c81e
commit 30532884f8
15 changed files with 80 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libstd/sys/windows/fs.rs
View file

@ -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 {

1
src/libstd/sys/windows/process.rs
View file

@ -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;