Skip to content

Commit d6f08da

Browse files
committed
Fix io::Take::read_buf
1 parent f0038a7 commit d6f08da

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

library/std/src/io/mod.rs

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

29442944
let mut cursor = sliced_buf.unfilled();
2945-
self.inner.read_buf(cursor.reborrow())?;
2945+
let result = self.inner.read_buf(cursor.reborrow());
29462946

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

29592959
self.limit -= filled as u64;
2960+
2961+
result
29602962
} else {
29612963
let written = buf.written();
2962-
self.inner.read_buf(buf.reborrow())?;
2964+
let result = self.inner.read_buf(buf.reborrow());
29632965
self.limit -= (buf.written() - written) as u64;
2966+
result
29642967
}
2965-
2966-
Ok(())
29672968
}
29682969
}
29692970

0 commit comments

Comments
 (0)