Update some str functions to slices, merge as_buf and unpack_slice.

3 files changed, 6 insertions, 8 deletions

diff --git a/src/libstd/net_ip.rs b/src/libstd/net_ip.rs
index f79a95d8ab5..6fb4b3c1b33 100644
--- a/src/libstd/net_ip.rs
+++ b/src/libstd/net_ip.rs
@@ -91,7 +91,7 @@ enum ip_get_addr_err {
 fn get_addr(++node: ~str, iotask: iotask)
         -> result::result<~[ip_addr], ip_get_addr_err> unsafe {
     do comm::listen |output_ch| {
-        do str::unpack_slice(node) |node_ptr, len| {
+        do str::as_buf(node) |node_ptr, len| {
             log(debug, #fmt("slice len %?", len));
             let handle = create_uv_getaddrinfo_t();
             let handle_ptr = ptr::addr_of(handle);
diff --git a/src/libstd/par.rs b/src/libstd/par.rs
index ce78bc945db..3c05a0b5574 100644
--- a/src/libstd/par.rs
+++ b/src/libstd/par.rs
@@ -46,7 +46,7 @@ fn map_slices<A: copy send, B: copy send>(
         while base < len {
             let end = uint::min(len, base + items_per_task);
             // FIXME: why is the ::<A, ()> annotation required here? (#2617)
-            do vec::unpack_slice::<A, ()>(xs) |p, _len| {
+            do vec::as_buf::<A, ()>(xs) |p, _len| {
                 let f = f();
                 let f = do future_spawn() |copy base| {
                     unsafe {
diff --git a/src/libstd/uv_ll.rs b/src/libstd/uv_ll.rs
index 56365514da9..cb1f5321f78 100644
--- a/src/libstd/uv_ll.rs
+++ b/src/libstd/uv_ll.rs
@@ -821,10 +821,9 @@ unsafe fn ip4_name(src: &sockaddr_in) -> ~str {
     // ipv4 addr max size: 15 + 1 trailing null byte
     let dst: ~[u8] = ~[0u8,0u8,0u8,0u8,0u8,0u8,0u8,0u8,
                      0u8,0u8,0u8,0u8,0u8,0u8,0u8,0u8];
-    let size = 16 as libc::size_t;
-    do vec::as_buf(dst) |dst_buf| {
+    do vec::as_buf(dst) |dst_buf, size| {
         rustrt::rust_uv_ip4_name(src as *sockaddr_in,
-                                              dst_buf, size);
+                                 dst_buf, size as libc::size_t);
         // seems that checking the result of uv_ip4_name
         // doesn't work too well..
         // you're stuck looking at the value of dst_buf
@@ -842,13 +841,12 @@ unsafe fn ip6_name(src: &sockaddr_in6) -> ~str {
                        0u8,0u8,0u8,0u8,0u8,0u8,0u8,0u8,
                        0u8,0u8,0u8,0u8,0u8,0u8,0u8,0u8,
                        0u8,0u8,0u8,0u8,0u8,0u8];
-    let size = 46 as libc::size_t;
-    do vec::as_buf(dst) |dst_buf| {
+    do vec::as_buf(dst) |dst_buf, size| {
         let src_unsafe_ptr = src as *sockaddr_in6;
         log(debug, #fmt("val of src *sockaddr_in6: %? sockaddr_in6: %?",
                         src_unsafe_ptr, src));
         let result = rustrt::rust_uv_ip6_name(src_unsafe_ptr,
-                                              dst_buf, size);
+                                              dst_buf, size as libc::size_t);
         alt result {
           0i32 {
             str::unsafe::from_buf(dst_buf)