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

Author: graydon

src/libcore/comm.rs

@@ -221,14 +221,13 @@ fn peek_(p: *rust_port) -> bool {
 fn select2<A: send, B: send>(p_a: port<A>, p_b: port<B>)
     -> either<A, B> {
     let ports = ~[(**p_a).po, (**p_b).po];
-    let n_ports = 2 as libc::size_t;
     let yield = 0u, yieldp = ptr::addr_of(yield);
 
     let mut resport: *rust_port;
     resport = rusti::init::<*rust_port>();
-    do vec::as_buf(ports) |ports| {
-        rustrt::rust_port_select(ptr::addr_of(resport), ports, n_ports,
-                                 yieldp);
+    do vec::as_buf(ports) |ports, n_ports| {
+        rustrt::rust_port_select(ptr::addr_of(resport), ports,
+                                 n_ports as size_t, yieldp);
     }
 
     if yield != 0u {

src/libcore/int-template.rs

@@ -94,7 +94,7 @@ fn from_str(s: ~str) -> option<T> { parse_buf(str::bytes(s), 10u) }
 /// Convert to a string in a given base
 fn to_str(n: T, radix: uint) -> ~str {
     do to_str_bytes(n, radix) |slice| {
-        do vec::unpack_slice(slice) |p, len| {
+        do vec::as_buf(slice) |p, len| {
             unsafe { str::unsafe::from_buf_len(p, len) }
         }
     }

src/libcore/io.rs

@@ -205,7 +205,7 @@ fn convert_whence(whence: seek_style) -> i32 {
 
 impl of reader for *libc::FILE {
     fn read(buf: &[mut u8], len: uint) -> uint {
-        do vec::unpack_slice(buf) |buf_p, buf_len| {
+        do vec::as_buf(buf) |buf_p, buf_len| {
             assert buf_len <= len;
 
             let count = libc::fread(buf_p as *mut c_void, 1u as size_t,
@@ -348,7 +348,7 @@ impl <T: writer, C> of writer for {base: T, cleanup: C} {
 
 impl of writer for *libc::FILE {
     fn write(v: &[const u8]) {
-        do vec::unpack_const_slice(v) |vbuf, len| {
+        do vec::as_const_buf(v) |vbuf, len| {
             let nout = libc::fwrite(vbuf as *c_void, len as size_t,
                                     1u as size_t, self);
             if nout < 1 as size_t {
@@ -377,7 +377,7 @@ fn FILE_writer(f: *libc::FILE, cleanup: bool) -> writer {
 impl of writer for fd_t {
     fn write(v: &[const u8]) {
         let mut count = 0u;
-        do vec::unpack_const_slice(v) |vbuf, len| {
+        do vec::as_const_buf(v) |vbuf, len| {
             while count < len {
                 let vb = ptr::const_offset(vbuf, count) as *c_void;
                 let nout = libc::write(self, vb, len as size_t);

src/libcore/option.rs

@@ -175,10 +175,10 @@ fn test_unwrap_ptr() {
 #[test]
 fn test_unwrap_str() {
     let x = ~"test";
-    let addr_x = str::as_buf(x, |buf| ptr::addr_of(buf));
+    let addr_x = str::as_buf(x, |buf, _len| ptr::addr_of(buf));
     let opt = some(x);
     let y = unwrap(opt);
-    let addr_y = str::as_buf(y, |buf| ptr::addr_of(buf));
+    let addr_y = str::as_buf(y, |buf, _len| ptr::addr_of(buf));
     assert addr_x == addr_y;
 }
 

src/libcore/os.rs

@@ -71,8 +71,8 @@ fn as_c_charp<T>(s: ~str, f: fn(*c_char) -> T) -> T {
 fn fill_charp_buf(f: fn(*mut c_char, size_t) -> bool)
     -> option<~str> {
     let buf = vec::to_mut(vec::from_elem(tmpbuf_sz, 0u8 as c_char));
-    do vec::as_mut_buf(buf) |b| {
-        if f(b, tmpbuf_sz as size_t) unsafe {
+    do vec::as_mut_buf(buf) |b, sz| {
+        if f(b, sz as size_t) unsafe {
             some(str::unsafe::from_buf(b as *u8))
         } else {
             none
@@ -667,7 +667,7 @@ fn copy_file(from: path, to: path) -> bool {
         let mut done = false;
         let mut ok = true;
         while !done {
-            do vec::as_mut_buf(buf) |b| {
+            do vec::as_mut_buf(buf) |b, _sz| {
               let nread = libc::fread(b as *mut c_void, 1u as size_t,
                                       bufsize as size_t,
                                       istream);
@@ -970,7 +970,7 @@ mod tests {
       assert (ostream as uint != 0u);
       let s = ~"hello";
       let mut buf = vec::to_mut(str::bytes(s) + ~[0 as u8]);
-      do vec::as_mut_buf(buf) |b| {
+      do vec::as_mut_buf(buf) |b, _len| {
           assert (libc::fwrite(b as *c_void, 1u as size_t,
                                (str::len(s) + 1u) as size_t, ostream)
                   == buf.len() as size_t)};

src/libcore/ptr.rs

@@ -192,8 +192,9 @@ fn test_buf_len() {
         do str::as_c_str(s1) |p1| {
             do str::as_c_str(s2) |p2| {
                 let v = ~[p0, p1, p2, null()];
-                do vec::as_buf(v) |vp| {
+                do vec::as_buf(v) |vp, len| {
                     assert unsafe { buf_len(vp) } == 3u;
+                    assert len == 4u;
                 }
             }
         }

src/libcore/run.rs

@@ -88,7 +88,7 @@ fn with_argv<T>(prog: ~str, args: ~[~str],
         vec::push_all(argptrs, str::as_c_str(*t, |b| ~[b]));
     }
     vec::push(argptrs, ptr::null());
-    vec::as_buf(argptrs, cb)
+    vec::as_buf(argptrs, |buf, _len| cb(buf))
 }
 
 #[cfg(unix)]
@@ -108,7 +108,7 @@ fn with_envp<T>(env: option<~[(~str,~str)]>,
             vec::push_all(ptrs, str::as_c_str(*t, |b| ~[b]));
         }
         vec::push(ptrs, ptr::null());
-        vec::as_buf(ptrs, |p|
+        vec::as_buf(ptrs, |p, _len|
             unsafe { cb(::unsafe::reinterpret_cast(p)) }
         )
       }