about summary refs log tree commit diff
path: root/src/libstd/net_ip.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-05-11 12:55:49 -0700
committerbors <bors@rust-lang.org>2013-05-11 12:55:49 -0700
commit957251817bb78f1f0e2f9e6efdb827b43c773ac4 (patch)
tree40e75ac20b0b88acc8ff324cb11003b70b1727c3 /src/libstd/net_ip.rs
parente478cedb0ab0bdb7e00a3a60a6946915af0fdd5a (diff)
parent24ef88cee96de837370ec370ed4d1f3aa3530a20 (diff)
downloadrust-957251817bb78f1f0e2f9e6efdb827b43c773ac4.tar.gz
rust-957251817bb78f1f0e2f9e6efdb827b43c773ac4.zip
auto merge of #6389 : sonwow/rust/issue-3356, r=bstrie
Fix for #3356
Diffstat (limited to 'src/libstd/net_ip.rs')
-rw-r--r--src/libstd/net_ip.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/net_ip.rs b/src/libstd/net_ip.rs
index 758e7a5e6ca..58775c5f2e4 100644
--- a/src/libstd/net_ip.rs
+++ b/src/libstd/net_ip.rs
@@ -225,7 +225,7 @@ pub mod v4 {
             let input_is_inaddr_none =
                 result::get(&ip_rep_result).as_u32() == INADDR_NONE;
 
-            let new_addr = uv_ip4_addr(str::from_slice(ip), 22);
+            let new_addr = uv_ip4_addr(str::to_owned(ip), 22);
             let reformatted_name = uv_ip4_name(&new_addr);
             debug!("try_parse_addr: input ip: %s reparsed ip: %s",
                             ip, reformatted_name);
@@ -278,7 +278,7 @@ pub mod v6 {
     pub fn try_parse_addr(ip: &str) -> result::Result<IpAddr,ParseAddrErr> {
         unsafe {
             // need to figure out how to establish a parse failure..
-            let new_addr = uv_ip6_addr(str::from_slice(ip), 22);
+            let new_addr = uv_ip6_addr(str::to_owned(ip), 22);
             let reparsed_name = uv_ip6_name(&new_addr);
             debug!("v6::try_parse_addr ip: '%s' reparsed '%s'",
                             ip, reparsed_name);