Skip to content

Commit e5bd9ba

Browse files
committed
Fixup accidentally-introduced changes
1 parent 72a2f56 commit e5bd9ba

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/sys/socket/mod.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1626,9 +1626,7 @@ impl<S> MultiHeaders<S> {
16261626
Some(v) => ((&v[ix * msg_controllen] as *const u8), msg_controllen),
16271627
None => (std::ptr::null(), 0),
16281628
};
1629-
let msg_hdr = unsafe {
1630-
pack_mhdr_to_receive(std::ptr::null(), 0, ptr, cap, address.assume_init_mut())
1631-
};
1629+
let msg_hdr = unsafe { pack_mhdr_to_receive(std::ptr::null(), 0, ptr, cap, address.as_mut_ptr()) };
16321630
libc::mmsghdr {
16331631
msg_hdr,
16341632
msg_len: 0,
@@ -1964,7 +1962,10 @@ unsafe fn pack_mhdr_to_receive<S>(
19641962
cmsg_buffer: *const u8,
19651963
cmsg_capacity: usize,
19661964
address: *mut S,
1967-
) -> msghdr where S: SockaddrLike {
1965+
) -> msghdr
1966+
where
1967+
S: SockaddrLike
1968+
{
19681969
// Musl's msghdr has private fields, so this is the only way to
19691970
// initialize it.
19701971
let mut mhdr = mem::MaybeUninit::<msghdr>::zeroed();
@@ -2052,7 +2053,7 @@ pub fn recvmsg<'a, 'outer, 'inner, S>(fd: RawFd, iov: &'outer mut [IoSliceMut<'i
20522053
where S: SockaddrLike + 'a,
20532054
'inner: 'outer
20542055
{
2055-
let mut address: mem::MaybeUninit<S> = mem::MaybeUninit::zeroed();
2056+
let mut address = mem::MaybeUninit::zeroed();
20562057

20572058
let (msg_control, msg_controllen) = cmsg_buffer.as_mut()
20582059
.map(|v| (v.as_mut_ptr(), v.capacity()))

0 commit comments

Comments
 (0)