Skip to content

Commit 07d966d

Browse files
committed
Add some tests
1 parent 7eece47 commit 07d966d

File tree

1 file changed

+20
-11
lines changed

1 file changed

+20
-11
lines changed

src/libstd/io/buffered.rs

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ impl<W: Write> BufWriter<W> {
541541
/// ```
542542
#[unstable(feature = "bufreader_buffer", issue = "45323")]
543543
pub fn buffer(&self) -> &[u8] {
544-
&self.buf[..]
544+
&self.buf
545545
}
546546

547547
/// Unwraps this `BufWriter`, returning the underlying writer.
@@ -984,31 +984,31 @@ mod tests {
984984
let mut buf = [0, 0, 0];
985985
let nread = reader.read(&mut buf);
986986
assert_eq!(nread.unwrap(), 3);
987-
let b: &[_] = &[5, 6, 7];
988-
assert_eq!(buf, b);
987+
assert_eq!(buf, [5, 6, 7]);
988+
assert_eq!(*reader.buffer(), []);
989989

990990
let mut buf = [0, 0];
991991
let nread = reader.read(&mut buf);
992992
assert_eq!(nread.unwrap(), 2);
993-
let b: &[_] = &[0, 1];
994-
assert_eq!(buf, b);
993+
assert_eq!(buf, [0, 1]);
994+
assert_eq!(*reader.buffer(), []);
995995

996996
let mut buf = [0];
997997
let nread = reader.read(&mut buf);
998998
assert_eq!(nread.unwrap(), 1);
999-
let b: &[_] = &[2];
1000-
assert_eq!(buf, b);
999+
assert_eq!(buf, [2]);
1000+
assert_eq!(*reader.buffer(), [3]);
10011001

10021002
let mut buf = [0, 0, 0];
10031003
let nread = reader.read(&mut buf);
10041004
assert_eq!(nread.unwrap(), 1);
1005-
let b: &[_] = &[3, 0, 0];
1006-
assert_eq!(buf, b);
1005+
assert_eq!(buf, [3, 0, 0]);
1006+
assert_eq!(*reader.buffer(), []);
10071007

10081008
let nread = reader.read(&mut buf);
10091009
assert_eq!(nread.unwrap(), 1);
1010-
let b: &[_] = &[4, 0, 0];
1011-
assert_eq!(buf, b);
1010+
assert_eq!(buf, [4, 0, 0]);
1011+
assert_eq!(*reader.buffer(), []);
10121012

10131013
assert_eq!(reader.read(&mut buf).unwrap(), 0);
10141014
}
@@ -1097,31 +1097,40 @@ mod tests {
10971097
let mut writer = BufWriter::with_capacity(2, inner);
10981098

10991099
writer.write(&[0, 1]).unwrap();
1100+
assert_eq!(*writer.buffer(), []);
11001101
assert_eq!(*writer.get_ref(), [0, 1]);
11011102

11021103
writer.write(&[2]).unwrap();
1104+
assert_eq!(*writer.buffer(), [2]);
11031105
assert_eq!(*writer.get_ref(), [0, 1]);
11041106

11051107
writer.write(&[3]).unwrap();
1108+
assert_eq!(*writer.buffer(), [2, 3]);
11061109
assert_eq!(*writer.get_ref(), [0, 1]);
11071110

11081111
writer.flush().unwrap();
1112+
assert_eq!(*writer.buffer(), []);
11091113
assert_eq!(*writer.get_ref(), [0, 1, 2, 3]);
11101114

11111115
writer.write(&[4]).unwrap();
11121116
writer.write(&[5]).unwrap();
1117+
assert_eq!(*writer.buffer(), [4, 5]);
11131118
assert_eq!(*writer.get_ref(), [0, 1, 2, 3]);
11141119

11151120
writer.write(&[6]).unwrap();
1121+
assert_eq!(*writer.buffer(), [6]);
11161122
assert_eq!(*writer.get_ref(), [0, 1, 2, 3, 4, 5]);
11171123

11181124
writer.write(&[7, 8]).unwrap();
1125+
assert_eq!(*writer.buffer(), []);
11191126
assert_eq!(*writer.get_ref(), [0, 1, 2, 3, 4, 5, 6, 7, 8]);
11201127

11211128
writer.write(&[9, 10, 11]).unwrap();
1129+
assert_eq!(*writer.buffer(), []);
11221130
assert_eq!(*writer.get_ref(), [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
11231131

11241132
writer.flush().unwrap();
1133+
assert_eq!(*writer.buffer(), []);
11251134
assert_eq!(*writer.get_ref(), [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
11261135
}
11271136

0 commit comments

Comments
 (0)