about summary refs log tree commit diff
path: root/src/libstd/sys/windows
diff options
context:
space:
mode:
authorOliver Schneider <git1984941651981@oli-obk.de>2015-03-20 08:19:13 +0100
committerOliver Schneider <git1984941651981@oli-obk.de>2015-03-20 08:19:13 +0100
commitb4a1e59146c70a12d8c4c1f85c08a2ecf9fb3d2e (patch)
tree7b986ee36f81d3566200a9acda28c20b5921e032 /src/libstd/sys/windows
parent0084f92302b3352372bfd14ebbf083bae695d16e (diff)
downloadrust-b4a1e59146c70a12d8c4c1f85c08a2ecf9fb3d2e.tar.gz
rust-b4a1e59146c70a12d8c4c1f85c08a2ecf9fb3d2e.zip
don't use Result::ok just to be able to use unwrap/unwrap_or
Diffstat (limited to 'src/libstd/sys/windows')
-rw-r--r--src/libstd/sys/windows/pipe.rs4
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(),