diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2013-12-18 09:57:58 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2013-12-25 23:10:46 -0800 |
| commit | 6cad8f4f14da1dd529100779db74b03d6db20faf (patch) | |
| tree | f3610bdf15fbe38e248a1d92b37919ed8d5a6219 /src/libstd/io/net/unix.rs | |
| parent | b47ff23673559ee9a5b91221e0212fd6a57d9802 (diff) | |
| download | rust-6cad8f4f14da1dd529100779db74b03d6db20faf.tar.gz rust-6cad8f4f14da1dd529100779db74b03d6db20faf.zip | |
Test fixes and rebase conflicts
* vec::raw::to_ptr is gone * Pausible => Pausable * Removing @ * Calling the main task "<main>" * Removing unused imports * Removing unused mut * Bringing some libextra tests up to date * Allowing compiletest to work at stage0 * Fixing the bootstrap-from-c rmake tests * assert => rtassert in a few cases * printing to stderr instead of stdout in fail!()
Diffstat (limited to 'src/libstd/io/net/unix.rs')
| -rw-r--r-- | src/libstd/io/net/unix.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/io/net/unix.rs b/src/libstd/io/net/unix.rs index 59a6903adbf..01b409d4316 100644 --- a/src/libstd/io/net/unix.rs +++ b/src/libstd/io/net/unix.rs @@ -175,7 +175,8 @@ mod tests { fn connect_error() { let mut called = false; io_error::cond.trap(|e| { - assert_eq!(e.kind, OtherIoError); + assert_eq!(e.kind, + if cfg!(windows) {OtherIoError} else {FileNotFound}); called = true; }).inside(|| { let stream = UnixStream::connect(&("path/to/nowhere")); |