Skip to content

Commit ac28718

Browse files
committed
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 parents 52769b6 + 9578af8 commit ac28718

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/libstd/run.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,7 @@ mod tests {
359359
let mut trapped_io_error = false;
360360
let opt_outp = io_error::cond.trap(|e| {
361361
trapped_io_error = true;
362-
// FIXME(#11023)
363-
assert_eq!(e.kind, if cfg!(windows) { OtherIoError } else { FileNotFound });
362+
assert_eq!(e.kind, FileNotFound);
364363
}).inside(|| -> Option<run::ProcessOutput> {
365364
run::process_output("no-binary-by-this-name-should-exist", [])
366365
});

0 commit comments

Comments
 (0)