summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-09-12 17:45:23 -0700
committerBrian Anderson <banderson@mozilla.com>2012-09-12 17:45:36 -0700
commitff54ac8e598bfc71e827c0b60e392c5f0fbd4d7e (patch)
treec5c20cafe2c415f1f3aecbc2fa60770e3ca9f1e3 /src/libstd
parent37cf649311bcf6fec2d9096b483ac4be81b70732 (diff)
downloadrust-ff54ac8e598bfc71e827c0b60e392c5f0fbd4d7e.tar.gz
rust-ff54ac8e598bfc71e827c0b60e392c5f0fbd4d7e.zip
Rename vec::unsafe to vec::raw
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/arena.rs6
-rw-r--r--src/libstd/net_tcp.rs4
-rw-r--r--src/libstd/uv_ll.rs10
3 files changed, 10 insertions, 10 deletions
diff --git a/src/libstd/arena.rs b/src/libstd/arena.rs
index 173348d8dca..637c7451de0 100644
--- a/src/libstd/arena.rs
+++ b/src/libstd/arena.rs
@@ -89,7 +89,7 @@ fn round_up_to(base: uint, align: uint) -> uint {
 // in it.
 unsafe fn destroy_chunk(chunk: Chunk) {
     let mut idx = 0;
-    let buf = vec::unsafe::to_ptr(chunk.data);
+    let buf = vec::raw::to_ptr(chunk.data);
     let fill = chunk.fill;
 
     while idx < fill {
@@ -156,7 +156,7 @@ impl &Arena {
         //       start, n_bytes, align, head.fill);
 
         unsafe {
-            ptr::offset(vec::unsafe::to_ptr(head.data), start)
+            ptr::offset(vec::raw::to_ptr(head.data), start)
         }
     }
 
@@ -200,7 +200,7 @@ impl &Arena {
         //       start, n_bytes, align, head.fill);
 
         unsafe {
-            let buf = vec::unsafe::to_ptr(head.data);
+            let buf = vec::raw::to_ptr(head.data);
             return (ptr::offset(buf, tydesc_start), ptr::offset(buf, start));
         }
     }
diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs
index 7622483a64b..31ef440e4a8 100644
--- a/src/libstd/net_tcp.rs
+++ b/src/libstd/net_tcp.rs
@@ -968,7 +968,7 @@ fn write_common_impl(socket_data_ptr: *TcpSocketData,
     let stream_handle_ptr =
         (*socket_data_ptr).stream_handle_ptr;
     let write_buf_vec =  ~[ uv::ll::buf_init(
-        vec::unsafe::to_ptr(raw_write_data),
+        vec::raw::to_ptr(raw_write_data),
         vec::len(raw_write_data)) ];
     let write_buf_vec_ptr = ptr::addr_of(write_buf_vec);
     let result_po = core::comm::Port::<TcpWriteResult>();
@@ -1103,7 +1103,7 @@ extern fn on_tcp_read_cb(stream: *uv::ll::uv_stream_t,
         log(debug, fmt!("tcp on_read_cb nread: %d", nread as int));
         let reader_ch = (*socket_data_ptr).reader_ch;
         let buf_base = uv::ll::get_base_from_buf(buf);
-        let new_bytes = vec::unsafe::from_buf(buf_base, nread as uint);
+        let new_bytes = vec::raw::from_buf(buf_base, nread as uint);
         core::comm::send(reader_ch, result::Ok(new_bytes));
       }
     }
diff --git a/src/libstd/uv_ll.rs b/src/libstd/uv_ll.rs
index cd150fc1abf..2fe410ec3ec 100644
--- a/src/libstd/uv_ll.rs
+++ b/src/libstd/uv_ll.rs
@@ -749,7 +749,7 @@ unsafe fn accept(server: *libc::c_void, client: *libc::c_void)
 
 unsafe fn write<T>(req: *uv_write_t, stream: *T,
          buf_in: *~[uv_buf_t], cb: *u8) -> libc::c_int {
-    let buf_ptr = vec::unsafe::to_ptr(*buf_in);
+    let buf_ptr = vec::raw::to_ptr(*buf_in);
     let buf_cnt = vec::len(*buf_in) as i32;
     return rustrt::rust_uv_write(req as *libc::c_void,
                               stream as *libc::c_void,
@@ -1046,7 +1046,7 @@ mod test {
                   as *request_wrapper;
             let buf_base = get_base_from_buf(buf);
             let buf_len = get_len_from_buf(buf);
-            let bytes = vec::unsafe::from_buf(buf_base, buf_len as uint);
+            let bytes = vec::raw::from_buf(buf_base, buf_len as uint);
             let read_chan = *((*client_data).read_chan);
             let msg_from_server = str::from_bytes(bytes);
             core::comm::send(read_chan, msg_from_server);
@@ -1122,7 +1122,7 @@ mod test {
         // struct that we'd cast to a void* and store as the
         // data field in our uv_connect_t struct
         let req_str_bytes = str::to_bytes(req_str);
-        let req_msg_ptr: *u8 = vec::unsafe::to_ptr(req_str_bytes);
+        let req_msg_ptr: *u8 = vec::raw::to_ptr(req_str_bytes);
         log(debug, fmt!("req_msg ptr: %u", req_msg_ptr as uint));
         let req_msg = ~[
             buf_init(req_msg_ptr, vec::len(req_str_bytes))
@@ -1221,7 +1221,7 @@ mod test {
                             buf_base as uint,
                             buf_len as uint,
                             nread));
-            let bytes = vec::unsafe::from_buf(buf_base, buf_len);
+            let bytes = vec::raw::from_buf(buf_base, buf_len);
             let request_str = str::from_bytes(bytes);
 
             let client_data = get_data_for_uv_handle(
@@ -1370,7 +1370,7 @@ mod test {
         let server_write_req_ptr = ptr::addr_of(server_write_req);
 
         let resp_str_bytes = str::to_bytes(server_resp_msg);
-        let resp_msg_ptr: *u8 = vec::unsafe::to_ptr(resp_str_bytes);
+        let resp_msg_ptr: *u8 = vec::raw::to_ptr(resp_str_bytes);
         log(debug, fmt!("resp_msg ptr: %u", resp_msg_ptr as uint));
         let resp_msg = ~[
             buf_init(resp_msg_ptr, vec::len(resp_str_bytes))