---

yaml
---
r: 30562
b: refs/heads/incoming
c: 10e317d
h: refs/heads/master
v: v3

Author: erickt

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 8dc9e6643ae73c571c0543d3aed2d7461ded9289
+refs/heads/incoming: 10e317de547851bdf714ada4d21b41f5b989d4ed
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/io.rs

@@ -292,9 +292,8 @@ impl ByteBuf: Reader {
     fn read(buf: &[mut u8], len: uint) -> uint {
         let count = uint::min(len, self.buf.len() - self.pos);
 
-        vec::u8::memcpy(buf,
-                        vec::const_view(self.buf, self.pos, self.buf.len()),
-                        count);
+        let view = vec::const_view(self.buf, self.pos, self.buf.len());
+        vec::bytes::memcpy(buf, view, count);
 
         self.pos += count;
 
@@ -684,7 +683,8 @@ impl MemBuffer: Writer {
             vec::reserve(buf, count);
             unsafe { vec::raw::set_len(buf, count); }
 
-            vec::u8::memcpy(vec::mut_view(buf, self.pos, count), v, v_len);
+            let view = vec::mut_view(buf, self.pos, count);
+            vec::bytes::memcpy(view, v, v_len);
 
             self.pos += v_len;
 

branches/incoming/src/libcore/vec.rs

@@ -88,7 +88,7 @@ export as_imm_buf;
 export as_mut_buf;
 export as_const_buf;
 export raw;
-export u8;
+export bytes;
 export extensions;
 export ConstVector;
 export CopyableVector;
@@ -1929,7 +1929,7 @@ mod raw {
 }
 
 /// Operations on `[u8]`
-mod u8 {
+mod bytes {
     export cmp;
     export lt, le, eq, ne, ge, gt;
     export hash;

branches/incoming/src/libstd/net_tcp.rs

@@ -787,7 +787,7 @@ impl TcpSocketBuf: io::Reader {
         let mut data = ~[];
         self.data.buf <-> data;
 
-        vec::u8::memcpy(buf, vec::view(data, 0, data.len()), count);
+        vec::bytes::memcpy(buf, vec::view(data, 0, data.len()), count);
 
         vec::push_all(self.data.buf, vec::view(data, count, data.len()));