Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Speed up Read::bytes #116651

Closed
wants to merge 3 commits into from
Closed

Speed up Read::bytes #116651

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca7eef7
Inline `Bytes::next` and `Bytes::size_hint`.
nnethercote Oct 11, 2023
69ad06f
Add `Bytes::byte` field.
nnethercote Oct 12, 2023
ed2a587
Use `read_exact` in `Bytes::next`.
nnethercote Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions library/std/src/io/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,7 @@ pub trait Read {
where
Self: Sized,
{
Bytes { inner: self }
Bytes { inner: self, byte: 0 }
}

/// Creates an adapter which will chain this stream with another.
Expand Down Expand Up @@ -2772,24 +2772,23 @@ impl<T> SizeHint for Take<T> {
#[derive(Debug)]
pub struct Bytes<R> {
inner: R,
byte: u8,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The commit explains why this is here, but that deserves a comment too.

}

#[stable(feature = "rust1", since = "1.0.0")]
impl<R: Read> Iterator for Bytes<R> {
type Item = Result<u8>;

#[inline]
fn next(&mut self) -> Option<Result<u8>> {
let mut byte = 0;
loop {
return match self.inner.read(slice::from_mut(&mut byte)) {
Ok(0) => None,
Ok(..) => Some(Ok(byte)),
Err(ref e) if e.is_interrupted() => continue,
Err(e) => Some(Err(e)),
};
match self.inner.read_exact(slice::from_mut(&mut self.byte)) {
Ok(()) => Some(Ok(self.byte)),
Err(e) if e.kind() == ErrorKind::UnexpectedEof => None,
Err(e) => Some(Err(e)),
}
}

#[inline]
fn size_hint(&self) -> (usize, Option<usize>) {
SizeHint::size_hint(&self.inner)
}
Expand Down
Loading