mmsg revert signature simplification (#2227)

nix-rust · Feb 24, 2024 · 79b86a7 · 79b86a7
1 parent 08e05a5
commit 79b86a7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/changelog/2119.changed.md b/changelog/2119.changed.md
diff --git a/src/sys/socket/mod.rs b/src/sys/socket/mod.rs
@@ -1499,11 +1499,11 @@ pub fn sendmmsg<'a, XS, AS, C, I, S>(
     flags: MsgFlags
 ) -> crate::Result<MultiResults<'a, S>>
     where
-        XS: IntoIterator<Item = I>,
+        XS: IntoIterator<Item = &'a I>,
         AS: AsRef<[Option<S>]>,
-        I: AsRef<[IoSlice<'a>]>,
-        C: AsRef<[ControlMessage<'a>]>,
-        S: SockaddrLike,
+        I: AsRef<[IoSlice<'a>]> + 'a,
+        C: AsRef<[ControlMessage<'a>]> + 'a,
+        S: SockaddrLike + 'a,
 {
 
     let mut count = 0;
@@ -1650,11 +1650,11 @@ pub fn recvmmsg<'a, XS, S, I>(
     mut timeout: Option<crate::sys::time::TimeSpec>,
 ) -> crate::Result<MultiResults<'a, S>>
 where
-    XS: IntoIterator<Item = I>,
-    I: AsMut<[IoSliceMut<'a>]>,
+    XS: IntoIterator<Item = &'a mut I>,
+    I: AsMut<[IoSliceMut<'a>]> + 'a,
 {
     let mut count = 0;
-    for (i, (mut slice, mmsghdr)) in slices.into_iter().zip(data.items.iter_mut()).enumerate() {
+    for (i, (slice, mmsghdr)) in slices.into_iter().zip(data.items.iter_mut()).enumerate() {
         let p = &mut mmsghdr.msg_hdr;
         p.msg_iov = slice.as_mut().as_mut_ptr().cast();
         p.msg_iovlen = slice.as_mut().len() as _;