rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

tidy

Browse Source
This commit is contained in:
Steven Fackler
2019-04-27 09:19:34 -07:00
parent bd177f3ea3
commit 89ff7cde5a
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libstd/io/buffered.rs
View File

@@ -5,7 +5,8 @@ use crate::io::prelude::*;
use crate::cmp; use crate::cmp;
use crate::error; use crate::error;
use crate::fmt; use crate::fmt;
use crate::io::{self, Initializer, DEFAULT_BUF_SIZE, Error, ErrorKind, SeekFrom, IoSlice, IoSliceMut}; use crate::io::{self, Initializer, DEFAULT_BUF_SIZE, Error, ErrorKind, SeekFrom, IoSlice,
IoSliceMut};
use crate::memchr; use crate::memchr;
/// The `BufReader` struct adds buffering to any reader. /// The `BufReader` struct adds buffering to any reader.

27
src/libstd/io/cursor.rs
View File

@@ -455,7 +455,10 @@ mod tests {
assert_eq!(writer.write_vectored(&[IoSlice::new(&[0])]).unwrap(), 1); assert_eq!(writer.write_vectored(&[IoSlice::new(&[0])]).unwrap(), 1);
assert_eq!(writer.position(), 1); assert_eq!(writer.position(), 1);
assert_eq!( assert_eq!(
writer.write_vectored(&[IoSlice::new(&[1, 2, 3]), IoSlice::new(&[4, 5, 6, 7])]).unwrap(), writer.write_vectored(&[
IoSlice::new(&[1, 2, 3]),
IoSlice::new(&[4, 5, 6, 7]),
]).unwrap(),
7, 7,
); );
assert_eq!(writer.position(), 8); assert_eq!(writer.position(), 8);
@@ -582,7 +585,10 @@ mod tests {
assert_eq!(reader.position(), 0); assert_eq!(reader.position(), 0);
let mut buf = [0]; let mut buf = [0];
assert_eq!( assert_eq!(
reader.read_vectored(&mut [IoSliceMut::new(&mut []), IoSliceMut::new(&mut buf)]).unwrap(), reader.read_vectored(&mut [
IoSliceMut::new(&mut []),
IoSliceMut::new(&mut buf),
]).unwrap(),
1, 1,
); );
assert_eq!(reader.position(), 1); assert_eq!(reader.position(), 1);
@@ -591,9 +597,10 @@ mod tests {
let mut buf1 = [0; 4]; let mut buf1 = [0; 4];
let mut buf2 = [0; 4]; let mut buf2 = [0; 4];
assert_eq!( assert_eq!(
reader.read_vectored( reader.read_vectored(&mut [
&mut [IoSliceMut::new(&mut buf1), IoSliceMut::new(&mut buf2)], IoSliceMut::new(&mut buf1),
).unwrap(), IoSliceMut::new(&mut buf2),
]).unwrap(),
7, 7,
); );
let b1: &[_] = &[1, 2, 3, 4]; let b1: &[_] = &[1, 2, 3, 4];
@@ -633,7 +640,10 @@ mod tests {
assert_eq!(reader.position(), 0); assert_eq!(reader.position(), 0);
let mut buf = [0]; let mut buf = [0];
assert_eq!( assert_eq!(
reader.read_vectored(&mut [IoSliceMut::new(&mut []), IoSliceMut::new(&mut buf)]).unwrap(), reader.read_vectored(&mut [
IoSliceMut::new(&mut []),
IoSliceMut::new(&mut buf),
]).unwrap(),
1, 1,
); );
assert_eq!(reader.position(), 1); assert_eq!(reader.position(), 1);
@@ -692,7 +702,10 @@ mod tests {
assert_eq!(reader.read_vectored(&mut [IoSliceMut::new(&mut buf)]).unwrap(), 0); assert_eq!(reader.read_vectored(&mut [IoSliceMut::new(&mut buf)]).unwrap(), 0);
let mut buf = [0]; let mut buf = [0];
assert_eq!( assert_eq!(
reader.read_vectored(&mut [IoSliceMut::new(&mut []), IoSliceMut::new(&mut buf)]).unwrap(), reader.read_vectored(&mut [
IoSliceMut::new(&mut []),
IoSliceMut::new(&mut buf),
]).unwrap(),
1, 1,
); );
assert_eq!(reader.len(), 7); assert_eq!(reader.len(), 7);

4
src/libstd/io/impls.rs
View File

@@ -1,6 +1,6 @@
use crate::cmp; use crate::cmp;
use crate::io::{self, SeekFrom, Read, Initializer, Write, Seek, BufRead, Error, ErrorKind, IoSliceMut, use crate::io::{self, SeekFrom, Read, Initializer, Write, Seek, BufRead, Error, ErrorKind,
IoSlice}; IoSliceMut, IoSlice};
use crate::fmt; use crate::fmt;
use crate::mem; use crate::mem;