bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #11038 : alexcrichton/rust/fix-osx-leak, r=cmr

Browse source 
I haven't landed this fix upstream just yet, but it's opened as
joyent/libuv#1048. For now, I've locally merged it into my fork, and I've
upgraded our repo to point to the new revision.

Closes #11027
This commit is contained in:
bors 2013-12-19 00:16:35 -08:00
commit ac28718f73
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libstd/run.rs
View file

@ -359,8 +359,7 @@ mod tests {
let mut trapped_io_error = false;
let opt_outp = io_error::cond.trap(|e| {
trapped_io_error = true;
// FIXME(#11023)
assert_eq!(e.kind, if cfg!(windows) { OtherIoError } else { FileNotFound });
assert_eq!(e.kind, FileNotFound);
}).inside(|| -> Option<run::ProcessOutput> {
run::process_output("no-binary-by-this-name-should-exist", [])
});

2
src/libuv

@ -1 +1 @@
Subproject commit 3b89ea32c041fb76fe5e12bfc0f8d5c317d6b06f
Subproject commit 2207d4ab078d605138e60d72f0c91667291a346d