about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorTim Chevalier <chevalier@alum.wellesley.edu>2013-01-13 14:58:24 -0800
committerTim Chevalier <chevalier@alum.wellesley.edu>2013-01-13 14:58:24 -0800
commit26334b64a29612be8190bedfbd507fa6ac6f8eb5 (patch)
tree230f918604ae646421c70820013bb7e1a3bd8f27 /src/libstd
parent9bb399a6d67511fc30d9d25b62fd9cb7101434c1 (diff)
parent5cfde77bca32bd956be4a0db65887d9efd333d2b (diff)
downloadrust-26334b64a29612be8190bedfbd507fa6ac6f8eb5.tar.gz
rust-26334b64a29612be8190bedfbd507fa6ac6f8eb5.zip
Merge pull request #4411 from wting/4203_rename_memcpy
Rename memcpy, memmove, memset
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/net_tcp.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs
index d4bfed82efc..9e0dc0ff12e 100644
--- a/src/libstd/net_tcp.rs
+++ b/src/libstd/net_tcp.rs
@@ -827,7 +827,7 @@ impl TcpSocketBuf: io::Reader {
         let mut data = ~[];
         self.data.buf <-> data;
 
-        vec::bytes::memcpy(buf, vec::view(data, 0, data.len()), count);
+        vec::bytes::copy_memory(buf, vec::view(data, 0, data.len()), count);
 
         self.data.buf.push_all(vec::view(data, count, data.len()));