Fix bad vec usage

Signed-off-by: Alex Saveau <[email protected]>
bytecodealliance · Aug 15, 2024 · 619d4fd · 619d4fd
1 parent 966e296
commit 619d4fd
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/tests/net/unix_alloc.rs b/tests/net/unix_alloc.rs
@@ -446,13 +446,13 @@ fn test_unix_msg_with_scm_rights() {
             let mut pipe_end = None;
 
             let mut buffer = vec![0; BUFFER_SIZE];
-            let mut cmsg_space = vec![MaybeUninit::uninit(); rustix::cmsg_space!(ScmRights(1))];
+            let mut cmsg_space = Vec::with_capacity(rustix::cmsg_space!(ScmRights(1)));
 
             'exit: loop {
                 let data_socket = accept(&connection_socket).unwrap();
                 let mut sum = 0;
                 loop {
-                    let mut cmsg_buffer = RecvAncillaryBuffer::new(&mut cmsg_space);
+                    let mut cmsg_buffer = RecvAncillaryBuffer::new(cmsg_space.spare_capacity_mut());
                     let nread = recvmsg(
                         &data_socket,
                         &mut [IoSliceMut::new(&mut buffer)],
@@ -554,8 +554,8 @@ fn test_unix_msg_with_scm_rights() {
         // Format the CMSG.
         let we = [write_end.as_fd()];
         let msg = SendAncillaryMessage::ScmRights(&we);
-        let mut space = vec![MaybeUninit::uninit(); msg.size()];
-        let mut cmsg_buffer = SendAncillaryBuffer::new(&mut space);
+        let mut space = Vec::with_capacity(msg.size());
+        let mut cmsg_buffer = SendAncillaryBuffer::new(space.spare_capacity_mut());
         assert!(cmsg_buffer.push(msg));
 
         connect_unix(&data_socket, &addr).unwrap();
@@ -619,8 +619,8 @@ fn test_unix_peercred() {
     assert_eq!(ucred.gid, getgid());
 
     let msg = SendAncillaryMessage::ScmCredentials(ucred);
-    let mut space = vec![MaybeUninit::uninit(); msg.size()];
-    let mut cmsg_buffer = SendAncillaryBuffer::new(&mut space);
+    let mut space = Vec::with_capacity(msg.size());
+    let mut cmsg_buffer = SendAncillaryBuffer::new(space.spare_capacity_mut());
     assert!(cmsg_buffer.push(msg));
 
     sendmsg(
@@ -631,8 +631,8 @@ fn test_unix_peercred() {
     )
     .unwrap();
 
-    let mut cmsg_space = vec![MaybeUninit::uninit(); rustix::cmsg_space!(ScmCredentials(1))];
-    let mut cmsg_buffer = RecvAncillaryBuffer::new(&mut cmsg_space);
+    let mut cmsg_space = Vec::with_capacity(rustix::cmsg_space!(ScmCredentials(1)));
+    let mut cmsg_buffer = RecvAncillaryBuffer::new(cmsg_space.spare_capacity_mut());
 
     let mut buffer = vec![0; BUFFER_SIZE];
     recvmsg(
@@ -684,13 +684,13 @@ fn test_unix_msg_with_combo() {
 
             let mut buffer = vec![0; BUFFER_SIZE];
             let mut cmsg_space =
-                vec![MaybeUninit::uninit(); rustix::cmsg_space!(ScmRights(1), ScmRights(2))];
+                Vec::with_capacity(rustix::cmsg_space!(ScmRights(1), ScmRights(2)));
 
             'exit: loop {
                 let data_socket = accept(&connection_socket).unwrap();
                 let mut sum = 0;
                 loop {
-                    let mut cmsg_buffer = RecvAncillaryBuffer::new(&mut cmsg_space);
+                    let mut cmsg_buffer = RecvAncillaryBuffer::new(cmsg_space.spare_capacity_mut());
                     let nread = recvmsg(
                         &data_socket,
                         &mut [IoSliceMut::new(&mut buffer)],
@@ -806,9 +806,8 @@ fn test_unix_msg_with_combo() {
 
         let data_socket = socket(AddressFamily::UNIX, SocketType::SEQPACKET, None).unwrap();
 
-        let mut space =
-            vec![MaybeUninit::uninit(); rustix::cmsg_space!(ScmRights(1), ScmRights(2))];
-        let mut cmsg_buffer = SendAncillaryBuffer::new(&mut space);
+        let mut space = Vec::with_capacity(rustix::cmsg_space!(ScmRights(1), ScmRights(2)));
+        let mut cmsg_buffer = SendAncillaryBuffer::new(space.spare_capacity_mut());
 
         // Format a CMSG.
         let we = [write_end.as_fd(), another_write_end.as_fd()];