Skip to content

Commit

Permalink
Unrolled build for rust-lang#125333
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#125333 - hermit-os:fuse, r=workingjubilee

switch to the default implementation of `write_vectored`

HermitOS doesn't support write_vectored and switch to the default implementation of `write_vectored`.
  • Loading branch information
rust-timer authored May 21, 2024
2 parents 60faa27 + d39dc0a commit 7dffa17
Showing 1 changed file with 4 additions and 21 deletions.
25 changes: 4 additions & 21 deletions library/std/src/sys/pal/hermit/net.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,23 +175,12 @@ impl Socket {
}

pub fn read_vectored(&self, bufs: &mut [IoSliceMut<'_>]) -> io::Result<usize> {
let mut size: isize = 0;

for i in bufs.iter_mut() {
let ret: isize =
cvt(unsafe { netc::read(self.0.as_raw_fd(), i.as_mut_ptr(), i.len()) })?;

if ret != 0 {
size += ret;
}
}

Ok(size.try_into().unwrap())
crate::io::default_read_vectored(|b| self.read(b), bufs)
}

#[inline]
pub fn is_read_vectored(&self) -> bool {
true
false
}

fn recv_from_with_flags(&self, buf: &mut [u8], flags: i32) -> io::Result<(usize, SocketAddr)> {
Expand Down Expand Up @@ -225,17 +214,11 @@ impl Socket {
}

pub fn write_vectored(&self, bufs: &[IoSlice<'_>]) -> io::Result<usize> {
let mut size: isize = 0;

for i in bufs.iter() {
size += cvt(unsafe { netc::write(self.0.as_raw_fd(), i.as_ptr(), i.len()) })?;
}

Ok(size.try_into().unwrap())
crate::io::default_write_vectored(|b| self.write(b), bufs)
}

pub fn is_write_vectored(&self) -> bool {
true
false
}

pub fn set_timeout(&self, dur: Option<Duration>, kind: i32) -> io::Result<()> {
Expand Down

0 comments on commit 7dffa17

Please sign in to comment.