diff options
| author | bors <bors@rust-lang.org> | 2015-03-20 23:16:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-20 23:16:47 +0000 |
| commit | e2fa53e593a854a609ae9efe5a1bbe15265f0a6f (patch) | |
| tree | 31d6cf6dcb795deb1b8bda95d58cfbf02002000b /src/libstd/sys/windows | |
| parent | 68d69415637186755482d2584e6ba82b67bc1d89 (diff) | |
| parent | b4a1e59146c70a12d8c4c1f85c08a2ecf9fb3d2e (diff) | |
| download | rust-e2fa53e593a854a609ae9efe5a1bbe15265f0a6f.tar.gz rust-e2fa53e593a854a609ae9efe5a1bbe15265f0a6f.zip | |
Auto merge of #23512 - oli-obk:result_ok_unwrap, r=alexcrichton
because then the call to `unwrap()` will not print the error object.
Diffstat (limited to 'src/libstd/sys/windows')
| -rw-r--r-- | src/libstd/sys/windows/pipe.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/windows/pipe.rs b/src/libstd/sys/windows/pipe.rs index 2b03e9e7431..17fdd6755c6 100644 --- a/src/libstd/sys/windows/pipe.rs +++ b/src/libstd/sys/windows/pipe.rs @@ -757,10 +757,10 @@ impl UnixAcceptor { impl Clone for UnixAcceptor { fn clone(&self) -> UnixAcceptor { - let name = to_utf16(&self.listener.name).ok().unwrap(); + let name = to_utf16(&self.listener.name).unwrap(); UnixAcceptor { inner: self.inner.clone(), - event: Event::new(true, false).ok().unwrap(), + event: Event::new(true, false).unwrap(), deadline: 0, listener: UnixListener { name: self.listener.name.clone(), |