Skip to content

Commit 2be3003

Browse files
committed
---
yaml --- r: 28540 b: refs/heads/try c: 10e317d h: refs/heads/master v: v3
1 parent 07e6783 commit 2be3003

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
5-
refs/heads/try: 8dc9e6643ae73c571c0543d3aed2d7461ded9289
5+
refs/heads/try: 10e317de547851bdf714ada4d21b41f5b989d4ed
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/libcore/io.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,9 +292,8 @@ impl ByteBuf: Reader {
292292
fn read(buf: &[mut u8], len: uint) -> uint {
293293
let count = uint::min(len, self.buf.len() - self.pos);
294294
295-
vec::u8::memcpy(buf,
296-
vec::const_view(self.buf, self.pos, self.buf.len()),
297-
count);
295+
let view = vec::const_view(self.buf, self.pos, self.buf.len());
296+
vec::bytes::memcpy(buf, view, count);
298297
299298
self.pos += count;
300299
@@ -684,7 +683,8 @@ impl MemBuffer: Writer {
684683
vec::reserve(buf, count);
685684
unsafe { vec::raw::set_len(buf, count); }
686685
687-
vec::u8::memcpy(vec::mut_view(buf, self.pos, count), v, v_len);
686+
let view = vec::mut_view(buf, self.pos, count);
687+
vec::bytes::memcpy(view, v, v_len);
688688
689689
self.pos += v_len;
690690

branches/try/src/libcore/vec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export as_imm_buf;
8888
export as_mut_buf;
8989
export as_const_buf;
9090
export raw;
91-
export u8;
91+
export bytes;
9292
export extensions;
9393
export ConstVector;
9494
export CopyableVector;
@@ -1929,7 +1929,7 @@ mod raw {
19291929
}
19301930

19311931
/// Operations on `[u8]`
1932-
mod u8 {
1932+
mod bytes {
19331933
export cmp;
19341934
export lt, le, eq, ne, ge, gt;
19351935
export hash;

branches/try/src/libstd/net_tcp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ impl TcpSocketBuf: io::Reader {
787787
let mut data = ~[];
788788
self.data.buf <-> data;
789789

790-
vec::u8::memcpy(buf, vec::view(data, 0, data.len()), count);
790+
vec::bytes::memcpy(buf, vec::view(data, 0, data.len()), count);
791791

792792
vec::push_all(self.data.buf, vec::view(data, count, data.len()));
793793

0 commit comments

Comments
 (0)