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

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

2 files changed, 1 insertions, 2 deletions

diff --git a/src/libstd/run.rs b/src/libstd/run.rs
index 3c4d06bc71f..85b57fdbc35 100644
--- a/src/libstd/run.rs
+++ b/src/libstd/run.rs
@@ -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", [])
         });
diff --git a/src/libuv b/src/libuv
-Subproject 3b89ea32c041fb76fe5e12bfc0f8d5c317d6b06
+Subproject 2207d4ab078d605138e60d72f0c91667291a346