Skip to content

Commit 8472204

Browse files
committed
Fix io::Take::read_buf
1 parent bab810c commit 8472204

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

std/src/io/mod.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -2941,7 +2941,7 @@ impl<T: Read> Read for Take<T> {
29412941
}
29422942

29432943
let mut cursor = sliced_buf.unfilled();
2944-
self.inner.read_buf(cursor.reborrow())?;
2944+
let result = self.inner.read_buf(cursor.reborrow());
29452945

29462946
let new_init = cursor.init_ref().len();
29472947
let filled = sliced_buf.len();
@@ -2956,13 +2956,14 @@ impl<T: Read> Read for Take<T> {
29562956
}
29572957

29582958
self.limit -= filled as u64;
2959+
2960+
result
29592961
} else {
29602962
let written = buf.written();
2961-
self.inner.read_buf(buf.reborrow())?;
2963+
let result = self.inner.read_buf(buf.reborrow());
29622964
self.limit -= (buf.written() - written) as u64;
2965+
result
29632966
}
2964-
2965-
Ok(())
29662967
}
29672968
}
29682969

0 commit comments

Comments
 (0)