Skip to content

Commit 79b86a7

Browse files
authored
mmsg revert signature simplification (#2227)
1 parent 08e05a5 commit 79b86a7

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

changelog/2119.changed.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/sys/socket/mod.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1499,11 +1499,11 @@ pub fn sendmmsg<'a, XS, AS, C, I, S>(
14991499
flags: MsgFlags
15001500
) -> crate::Result<MultiResults<'a, S>>
15011501
where
1502-
XS: IntoIterator<Item = I>,
1502+
XS: IntoIterator<Item = &'a I>,
15031503
AS: AsRef<[Option<S>]>,
1504-
I: AsRef<[IoSlice<'a>]>,
1505-
C: AsRef<[ControlMessage<'a>]>,
1506-
S: SockaddrLike,
1504+
I: AsRef<[IoSlice<'a>]> + 'a,
1505+
C: AsRef<[ControlMessage<'a>]> + 'a,
1506+
S: SockaddrLike + 'a,
15071507
{
15081508

15091509
let mut count = 0;
@@ -1650,11 +1650,11 @@ pub fn recvmmsg<'a, XS, S, I>(
16501650
mut timeout: Option<crate::sys::time::TimeSpec>,
16511651
) -> crate::Result<MultiResults<'a, S>>
16521652
where
1653-
XS: IntoIterator<Item = I>,
1654-
I: AsMut<[IoSliceMut<'a>]>,
1653+
XS: IntoIterator<Item = &'a mut I>,
1654+
I: AsMut<[IoSliceMut<'a>]> + 'a,
16551655
{
16561656
let mut count = 0;
1657-
for (i, (mut slice, mmsghdr)) in slices.into_iter().zip(data.items.iter_mut()).enumerate() {
1657+
for (i, (slice, mmsghdr)) in slices.into_iter().zip(data.items.iter_mut()).enumerate() {
16581658
let p = &mut mmsghdr.msg_hdr;
16591659
p.msg_iov = slice.as_mut().as_mut_ptr().cast();
16601660
p.msg_iovlen = slice.as_mut().len() as _;

0 commit comments

Comments
 (0)