diff options
| author | Nick Cameron <nrc@ncameron.org> | 2022-06-07 08:43:54 +0100 |
|---|---|---|
| committer | Nick Cameron <nrc@ncameron.org> | 2022-08-05 17:18:51 +0100 |
| commit | 1a2122fff015d1d7fb31fe3a55e49027d67d79af (patch) | |
| tree | 374f8a15ec2b3e0c8a61f25bebdb5122c265041e /library/std/src/sys/solid | |
| parent | b56cf67ce14580111ffb07a08a293e217566e116 (diff) | |
| download | rust-1a2122fff015d1d7fb31fe3a55e49027d67d79af.tar.gz rust-1a2122fff015d1d7fb31fe3a55e49027d67d79af.zip | |
non-linux platforms
Signed-off-by: Nick Cameron <nrc@ncameron.org>
Diffstat (limited to 'library/std/src/sys/solid')
| -rw-r--r-- | library/std/src/sys/solid/fs.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/library/std/src/sys/solid/fs.rs b/library/std/src/sys/solid/fs.rs index a2cbee4dcf0..0848d3d8f10 100644 --- a/library/std/src/sys/solid/fs.rs +++ b/library/std/src/sys/solid/fs.rs @@ -2,7 +2,7 @@ use super::{abi, error}; use crate::{ ffi::{CStr, CString, OsStr, OsString}, fmt, - io::{self, IoSlice, IoSliceMut, ReadBuf, SeekFrom}, + io::{self, BorrowedCursor, IoSlice, IoSliceMut, SeekFrom}, mem::MaybeUninit, os::raw::{c_int, c_short}, os::solid::ffi::OsStrExt, @@ -358,13 +358,13 @@ impl File { } } - pub fn read_buf(&self, buf: &mut ReadBuf<'_>) -> io::Result<()> { + pub fn read_buf(&self, mut cursor: BorrowedCursor<'_, '_>) -> io::Result<()> { unsafe { - let len = buf.remaining(); + let len = cursor.capacity(); let mut out_num_bytes = MaybeUninit::uninit(); error::SolidError::err_if_negative(abi::SOLID_FS_Read( self.fd.raw(), - buf.unfilled_mut().as_mut_ptr() as *mut u8, + cursor.as_mut().as_mut_ptr() as *mut u8, len, out_num_bytes.as_mut_ptr(), )) @@ -376,9 +376,7 @@ impl File { // Safety: `num_bytes_read` bytes were written to the unfilled // portion of the buffer - buf.assume_init(num_bytes_read); - - buf.add_filled(num_bytes_read); + cursor.advance(num_bytes_read); Ok(()) } |
