@@ -541,7 +541,7 @@ impl<W: Write> BufWriter<W> {
541
541
/// ```
542
542
#[ unstable( feature = "bufreader_buffer" , issue = "45323" ) ]
543
543
pub fn buffer ( & self ) -> & [ u8 ] {
544
- & self . buf [ .. ]
544
+ & self . buf
545
545
}
546
546
547
547
/// Unwraps this `BufWriter`, returning the underlying writer.
@@ -984,31 +984,31 @@ mod tests {
984
984
let mut buf = [ 0 , 0 , 0 ] ;
985
985
let nread = reader. read ( & mut buf) ;
986
986
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 ( ) , [ ] ) ;
989
989
990
990
let mut buf = [ 0 , 0 ] ;
991
991
let nread = reader. read ( & mut buf) ;
992
992
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 ( ) , [ ] ) ;
995
995
996
996
let mut buf = [ 0 ] ;
997
997
let nread = reader. read ( & mut buf) ;
998
998
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 ] ) ;
1001
1001
1002
1002
let mut buf = [ 0 , 0 , 0 ] ;
1003
1003
let nread = reader. read ( & mut buf) ;
1004
1004
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 ( ) , [ ] ) ;
1007
1007
1008
1008
let nread = reader. read ( & mut buf) ;
1009
1009
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 ( ) , [ ] ) ;
1012
1012
1013
1013
assert_eq ! ( reader. read( & mut buf) . unwrap( ) , 0 ) ;
1014
1014
}
@@ -1097,31 +1097,40 @@ mod tests {
1097
1097
let mut writer = BufWriter :: with_capacity ( 2 , inner) ;
1098
1098
1099
1099
writer. write ( & [ 0 , 1 ] ) . unwrap ( ) ;
1100
+ assert_eq ! ( * writer. buffer( ) , [ ] ) ;
1100
1101
assert_eq ! ( * writer. get_ref( ) , [ 0 , 1 ] ) ;
1101
1102
1102
1103
writer. write ( & [ 2 ] ) . unwrap ( ) ;
1104
+ assert_eq ! ( * writer. buffer( ) , [ 2 ] ) ;
1103
1105
assert_eq ! ( * writer. get_ref( ) , [ 0 , 1 ] ) ;
1104
1106
1105
1107
writer. write ( & [ 3 ] ) . unwrap ( ) ;
1108
+ assert_eq ! ( * writer. buffer( ) , [ 2 , 3 ] ) ;
1106
1109
assert_eq ! ( * writer. get_ref( ) , [ 0 , 1 ] ) ;
1107
1110
1108
1111
writer. flush ( ) . unwrap ( ) ;
1112
+ assert_eq ! ( * writer. buffer( ) , [ ] ) ;
1109
1113
assert_eq ! ( * writer. get_ref( ) , [ 0 , 1 , 2 , 3 ] ) ;
1110
1114
1111
1115
writer. write ( & [ 4 ] ) . unwrap ( ) ;
1112
1116
writer. write ( & [ 5 ] ) . unwrap ( ) ;
1117
+ assert_eq ! ( * writer. buffer( ) , [ 4 , 5 ] ) ;
1113
1118
assert_eq ! ( * writer. get_ref( ) , [ 0 , 1 , 2 , 3 ] ) ;
1114
1119
1115
1120
writer. write ( & [ 6 ] ) . unwrap ( ) ;
1121
+ assert_eq ! ( * writer. buffer( ) , [ 6 ] ) ;
1116
1122
assert_eq ! ( * writer. get_ref( ) , [ 0 , 1 , 2 , 3 , 4 , 5 ] ) ;
1117
1123
1118
1124
writer. write ( & [ 7 , 8 ] ) . unwrap ( ) ;
1125
+ assert_eq ! ( * writer. buffer( ) , [ ] ) ;
1119
1126
assert_eq ! ( * writer. get_ref( ) , [ 0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 ] ) ;
1120
1127
1121
1128
writer. write ( & [ 9 , 10 , 11 ] ) . unwrap ( ) ;
1129
+ assert_eq ! ( * writer. buffer( ) , [ ] ) ;
1122
1130
assert_eq ! ( * writer. get_ref( ) , [ 0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 ] ) ;
1123
1131
1124
1132
writer. flush ( ) . unwrap ( ) ;
1133
+ assert_eq ! ( * writer. buffer( ) , [ ] ) ;
1125
1134
assert_eq ! ( * writer. get_ref( ) , [ 0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 ] ) ;
1126
1135
}
1127
1136
0 commit comments