about summary refs log tree commit diff
path: root/src/libstd/net
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-03-20 23:16:47 +0000
committerbors <bors@rust-lang.org>2015-03-20 23:16:47 +0000
commite2fa53e593a854a609ae9efe5a1bbe15265f0a6f (patch)
tree31d6cf6dcb795deb1b8bda95d58cfbf02002000b /src/libstd/net
parent68d69415637186755482d2584e6ba82b67bc1d89 (diff)
parentb4a1e59146c70a12d8c4c1f85c08a2ecf9fb3d2e (diff)
downloadrust-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/net')
-rw-r--r--src/libstd/net/addr.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/net/addr.rs b/src/libstd/net/addr.rs
index 702f81db8e2..87241117043 100644
--- a/src/libstd/net/addr.rs
+++ b/src/libstd/net/addr.rs
@@ -617,7 +617,7 @@ mod tests {
                  unique_local: bool, global: bool,
                  u_link_local: bool, u_site_local: bool, u_global: bool,
                  m_scope: Option<Ipv6MulticastScope>) {
-            let ip: Ipv6Addr = str_addr.parse().ok().unwrap();
+            let ip: Ipv6Addr = str_addr.parse().unwrap();
             assert_eq!(str_addr, ip.to_string());
 
             assert_eq!(ip.is_unspecified(), unspec);