rollup merge of #17355 : gamazeps/issue17210

[rust.git] / src / librustuv / addrinfo.rs

diff --git a/src/librustuv/addrinfo.rs b/src/librustuv/addrinfo.rs
index fa30199109e76ce2554da23076a1f33283b37d57..995f73af258fff40b5291219a33fb794a7746dd7 100644 (file)
--- a/src/librustuv/addrinfo.rs
+++ b/src/librustuv/addrinfo.rs
@@ -11,7 +11,7 @@
 use libc::c_int;
 use libc;
 use std::mem;
-use std::ptr::{null, mut_null};
+use std::ptr::{null, null_mut};
 use std::rt::task::BlockedTask;
 use std::rt::rtio;
 
@@ -40,7 +40,7 @@ pub fn run(loop_: &Loop, node: Option<&str>, service: Option<&str>,
         let (_c_node, c_node_ptr) = match node {
             Some(n) => {
                 let c_node = n.to_c_str();
-                let c_node_ptr = c_node.with_ref(|r| r);
+                let c_node_ptr = c_node.as_ptr();
                 (Some(c_node), c_node_ptr)
             }
             None => (None, null())
@@ -49,7 +49,7 @@ pub fn run(loop_: &Loop, node: Option<&str>, service: Option<&str>,
         let (_c_service, c_service_ptr) = match service {
             Some(s) => {
                 let c_service = s.to_c_str();
-                let c_service_ptr = c_service.with_ref(|r| r);
+                let c_service_ptr = c_service.as_ptr();
                 (Some(c_service), c_service_ptr)
             }
             None => (None, null())
@@ -62,9 +62,9 @@ pub fn run(loop_: &Loop, node: Option<&str>, service: Option<&str>,
                 ai_socktype: 0,
                 ai_protocol: 0,
                 ai_addrlen: 0,
-                ai_canonname: mut_null(),
-                ai_addr: mut_null(),
-                ai_next: mut_null(),
+                ai_canonname: null_mut(),
+                ai_addr: null_mut(),
+                ai_next: null_mut(),
             }
         });
         let hint_ptr = hint.as_ref().map_or(null(), |x| {
@@ -86,7 +86,7 @@ pub fn run(loop_: &Loop, node: Option<&str>, service: Option<&str>,
                 });
 
                 match cx.status {
-                    0 => Ok(accum_addrinfo(cx.addrinfo.get_ref())),
+                    0 => Ok(accum_addrinfo(cx.addrinfo.as_ref().unwrap())),
                     n => Err(UvError(n))
                 }
             }