Clean up read_all

sfackler · sfackler · commit 14bec099521d · 2015-12-22T15:36:25.000-07:00
diff --git a/src/util.rs b/src/util.rs
@@ -6,11 +6,10 @@ pub fn parse_update_count(tag: String) -> u64 {
 }
 
 pub fn read_all<R: Read>(r: &mut R, mut buf: &mut [u8]) -> io::Result<()> {
-    let mut start = 0;
-    while start != buf.len() {
-        match r.read(&mut buf[start..]) {
+    while !buf.is_empty() {
+        match r.read(buf) {
             Ok(0) => return Err(io::Error::new(io::ErrorKind::Other, "unexpected EOF")),
-            Ok(len) => start += len,
+            Ok(len) => buf = &mut {buf}[len..],
             Err(ref e) if e.kind() == io::ErrorKind::Interrupted => {}
             Err(e) => return Err(e),
         }

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,10 @@ pub fn parse_update_count(tag: String) -> u64 {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`pub fn read_all<R: Read>(r: &mut R, mut buf: &mut [u8]) -> io::Result<()> {`
`9`		`- let mut start = 0;`
`10`		`- while start != buf.len() {`
`11`		`- match r.read(&mut buf[start..]) {`
	`9`	`+ while !buf.is_empty() {`
	`10`	`+ match r.read(buf) {`
`12`	`11`	`Ok(0) => return Err(io::Error::new(io::ErrorKind::Other, "unexpected EOF")),`
`13`		`- Ok(len) => start += len,`
	`12`	`+ Ok(len) => buf = &mut {buf}[len..],`
`14`	`13`	`Err(ref e) if e.kind() == io::ErrorKind::Interrupted => {}`
`15`	`14`	`Err(e) => return Err(e),`
`16`	`15`	`}`