nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix io::Take::read_buf

Browse Source
This commit is contained in:
Benoît du Garreau 2024-05-22 11:37:02 +02:00
parent 9d6039ccae
commit ba3b536e20
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/std/src/io/mod.rs
View File

@ -2941,7 +2941,7 @@ impl<T: Read> Read for Take<T> {
} }
let mut cursor = sliced_buf.unfilled(); let mut cursor = sliced_buf.unfilled();
self.inner.read_buf(cursor.reborrow())?; let result = self.inner.read_buf(cursor.reborrow());
let new_init = cursor.init_ref().len(); let new_init = cursor.init_ref().len();
let filled = sliced_buf.len(); let filled = sliced_buf.len();
@ -2956,13 +2956,14 @@ impl<T: Read> Read for Take<T> {
} }
self.limit -= filled as u64; self.limit -= filled as u64;
result
} else { } else {
let written = buf.written(); let written = buf.written();
self.inner.read_buf(buf.reborrow())?; let result = self.inner.read_buf(buf.reborrow());
self.limit -= (buf.written() - written) as u64; self.limit -= (buf.written() - written) as u64;
result
} }
Ok(())
} }
} }