From f59d645a9b1a4902ae52602db6270be75f7aa512 Mon Sep 17 00:00:00 2001 From: Nathan West Date: Thu, 29 Nov 2018 20:36:32 -0500 Subject: [PATCH 1/4] Defactored Bytes::read Removed unneeded refactoring of read_one_byte, which removed the unneeded dynamic dispatch (`dyn Read`) used by that function. --- src/libstd/io/mod.rs | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 076524e624a..452cbae4411 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -1936,18 +1936,6 @@ impl BufRead for Take { } } -fn read_one_byte(reader: &mut dyn Read) -> Option> { - let mut buf = [0]; - loop { - return match reader.read(&mut buf) { - Ok(0) => None, - Ok(..) => Some(Ok(buf[0])), - Err(ref e) if e.kind() == ErrorKind::Interrupted => continue, - Err(e) => Some(Err(e)), - }; - } -} - /// An iterator over `u8` values of a reader. /// /// This struct is generally created by calling [`bytes`] on a reader. @@ -1965,7 +1953,15 @@ impl Iterator for Bytes { type Item = Result; fn next(&mut self) -> Option> { - read_one_byte(&mut self.inner) + let mut buf = [0]; + loop { + return match self.inner.read(&mut buf) { + Err(ref e) if e.kind() == ErrorKind::Interrupted => continue, + Ok(0) => None, + Ok(..) => Some(Ok(buf[0])), + Err(e) => Some(Err(e)), + }; + } } } From 697b83b3074519db2980bf9b0c6422ade8410389 Mon Sep 17 00:00:00 2001 From: Nathan West Date: Thu, 29 Nov 2018 20:53:13 -0500 Subject: [PATCH 2/4] Removed unnecessary buf subscript --- src/libstd/io/mod.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 452cbae4411..a47b9f28dbb 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -271,6 +271,7 @@ use cmp; use fmt; +use slice; use str; use memchr; use ptr; @@ -285,7 +286,7 @@ pub use self::cursor::Cursor; pub use self::error::{Result, Error, ErrorKind}; #[stable(feature = "rust1", since = "1.0.0")] pub use self::util::{copy, sink, Sink, empty, Empty, repeat, Repeat}; -#[stable(feature = "rust1", since = "1.0.0")] +#[stable(feature = "rust1", since = "1.0.0")]f pub use self::stdio::{stdin, stdout, stderr, Stdin, Stdout, Stderr}; #[stable(feature = "rust1", since = "1.0.0")] pub use self::stdio::{StdoutLock, StderrLock, StdinLock}; @@ -1953,12 +1954,12 @@ impl Iterator for Bytes { type Item = Result; fn next(&mut self) -> Option> { - let mut buf = [0]; + let mut byte = 0; loop { - return match self.inner.read(&mut buf) { + return match self.inner.read(slice::from_mut(&mut byte)) { Err(ref e) if e.kind() == ErrorKind::Interrupted => continue, Ok(0) => None, - Ok(..) => Some(Ok(buf[0])), + Ok(..) => Some(Ok(byte)), Err(e) => Some(Err(e)), }; } From 7c05ef5db076e981f4e1ed600138053cc766bbeb Mon Sep 17 00:00:00 2001 From: Nathan West Date: Thu, 29 Nov 2018 20:53:37 -0500 Subject: [PATCH 3/4] Typo --- src/libstd/io/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index a47b9f28dbb..d89c6af5b0b 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -286,7 +286,7 @@ pub use self::cursor::Cursor; pub use self::error::{Result, Error, ErrorKind}; #[stable(feature = "rust1", since = "1.0.0")] pub use self::util::{copy, sink, Sink, empty, Empty, repeat, Repeat}; -#[stable(feature = "rust1", since = "1.0.0")]f +#[stable(feature = "rust1", since = "1.0.0")] pub use self::stdio::{stdin, stdout, stderr, Stdin, Stdout, Stderr}; #[stable(feature = "rust1", since = "1.0.0")] pub use self::stdio::{StdoutLock, StderrLock, StdinLock}; From a1790e8c200335b6f41f09bb7c7d17bd65b43f8a Mon Sep 17 00:00:00 2001 From: Nathan West Date: Mon, 17 Dec 2018 17:43:52 -0800 Subject: [PATCH 4/4] Reordered match arms --- src/libstd/io/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index d89c6af5b0b..e102cb49930 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -1957,9 +1957,9 @@ impl Iterator for Bytes { let mut byte = 0; loop { return match self.inner.read(slice::from_mut(&mut byte)) { - Err(ref e) if e.kind() == ErrorKind::Interrupted => continue, Ok(0) => None, Ok(..) => Some(Ok(byte)), + Err(ref e) if e.kind() == ErrorKind::Interrupted => continue, Err(e) => Some(Err(e)), }; }