Skip to content

Commit af82c43

Browse files
committed
---
yaml --- r: 46191 b: refs/heads/auto c: 808ccd3 h: refs/heads/master i: 46189: 1743b55 46187: f8a7fc2 46183: bb9fe40 46175: 539f265 v: v3
1 parent 5d703c1 commit af82c43

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 3a3f7b8e557aa9ff8e99a11c826ffc6e1147e414
17+
refs/heads/auto: 808ccd33495452e6fce56cbd7e889c88e39fccff

branches/auto/src/libcore/io.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ pub trait Reader {
5656
/// Read up to len bytes (or EOF) and put them into bytes (which
5757
/// must be at least len bytes long). Return number of bytes read.
5858
// FIXME (#2982): This should probably return an error.
59-
fn read(&self, bytes: &[mut u8], len: uint) -> uint;
59+
fn read(&self, bytes: &mut [u8], len: uint) -> uint;
6060

6161
/// Read a single byte, returning a negative value for EOF or read error.
6262
fn read_byte(&self) -> int;
@@ -416,7 +416,7 @@ fn convert_whence(whence: SeekStyle) -> i32 {
416416
}
417417

418418
impl *libc::FILE: Reader {
419-
fn read(&self, bytes: &[mut u8], len: uint) -> uint {
419+
fn read(&self, bytes: &mut [u8], len: uint) -> uint {
420420
unsafe {
421421
do vec::as_mut_buf(bytes) |buf_p, buf_len| {
422422
assert buf_len >= len;
@@ -461,7 +461,7 @@ struct Wrapper<T, C> {
461461
// duration of its lifetime.
462462
// FIXME there really should be a better way to do this // #2004
463463
impl<R: Reader, C> Wrapper<R, C>: Reader {
464-
fn read(&self, bytes: &[mut u8], len: uint) -> uint {
464+
fn read(&self, bytes: &mut [u8], len: uint) -> uint {
465465
self.base.read(bytes, len)
466466
}
467467
fn read_byte(&self) -> int { self.base.read_byte() }
@@ -528,7 +528,7 @@ pub struct BytesReader {
528528
}
529529
530530
impl BytesReader: Reader {
531-
fn read(&self, bytes: &[mut u8], len: uint) -> uint {
531+
fn read(&self, bytes: &mut [u8], len: uint) -> uint {
532532
let count = uint::min(len, self.bytes.len() - self.pos);
533533
534534
let view = vec::view(self.bytes, self.pos, self.bytes.len());

0 commit comments

Comments
 (0)