Use super let

Author: thaliaarchi

library/std/src/io/mod.rs

@@ -1636,6 +1636,7 @@ pub(crate) macro limit_slices($bufs:expr, $n:expr) {
     'slices: {
         let bufs: &[IoSlice<'_>] = $bufs;
         let n: usize = $n;
+        super let empty = &[IoSlice::new(&[])];
         // if bufs.len() > n || bufs.is_empty()
         if core::intrinsics::unlikely(bufs.len().wrapping_sub(1) >= n) {
             for (i, buf) in bufs.iter().enumerate() {
@@ -1644,10 +1645,9 @@ pub(crate) macro limit_slices($bufs:expr, $n:expr) {
                     break 'slices &bufs[i..i + len];
                 }
             }
-            // All buffers are empty. Since POSIX requires at least one buffer
-            // for [writev], but possibly bufs.is_empty(), return an empty write.
-            // [writev]: https://pubs.opengroup.org/onlinepubs/9799919799/functions/writev.html
-            return Ok(0);
+            // POSIX requires at least one buffer for writev.
+            // https://pubs.opengroup.org/onlinepubs/9799919799/functions/writev.html
+            break 'slices empty;
         }
         bufs
     }
@@ -1663,6 +1663,7 @@ pub(crate) macro limit_slices_mut($bufs:expr, $n:expr) {
     'slices: {
         let bufs: &mut [IoSliceMut<'_>] = $bufs;
         let n: usize = $n;
+        super let empty = &mut [IoSliceMut::new(&mut [])];
         // if bufs.len() > n || bufs.is_empty()
         if core::intrinsics::unlikely(bufs.len().wrapping_sub(1) >= n) {
             for (i, buf) in bufs.iter().enumerate() {
@@ -1671,10 +1672,9 @@ pub(crate) macro limit_slices_mut($bufs:expr, $n:expr) {
                     break 'slices &mut bufs[i..i + len];
                 }
             }
-            // All buffers are empty. Since POSIX requires at least one buffer
-            // for [readv], but possibly bufs.is_empty(), return an empty read.
-            // [readv]: https://pubs.opengroup.org/onlinepubs/9799919799/functions/readv.html
-            return Ok(0);
+            // POSIX requires at least one buffer for readv.
+            // https://pubs.opengroup.org/onlinepubs/9799919799/functions/readv.html
+            break 'slices empty;
         }
         bufs
     }

library/std/src/lib.rs

@@ -315,6 +315,7 @@
 #![feature(staged_api)]
 #![feature(stmt_expr_attributes)]
 #![feature(strict_provenance_lints)]
+#![feature(super_let)]
 #![feature(thread_local)]
 #![feature(try_blocks)]
 #![feature(try_trait_v2)]

library/std/src/sys/net/connection/socket/windows.rs

@@ -335,9 +335,7 @@ impl Socket {
 
     pub fn read_vectored(&self, bufs: &mut [IoSliceMut<'_>]) -> io::Result<usize> {
         // WSARecv requires at least one buffer.
-        if bufs.is_empty() {
-            return Ok(0);
-        }
+        let bufs = if bufs.is_empty() { &mut [IoSliceMut::new(&mut [])] } else { bufs };
 
         let length = cmp::min(bufs.len(), u32::MAX as usize) as u32;
         let mut nread = 0;
@@ -429,9 +427,7 @@ impl Socket {
 
     pub fn write_vectored(&self, bufs: &[IoSlice<'_>]) -> io::Result<usize> {
         // WSASend requires at least one buffer.
-        if bufs.is_empty() {
-            return Ok(0);
-        }
+        let bufs = if bufs.is_empty() { &[IoSlice::new(&[])] } else { bufs };
 
         let length = cmp::min(bufs.len(), u32::MAX as usize) as u32;
         let mut nwritten = 0;