about summary refs log tree commit diff
path: root/src/libstd/sys/cloudabi/thread.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-08-15 12:35:03 +0000
committerbors <bors@rust-lang.org>2019-08-15 12:35:03 +0000
commitf7af19c279b8b7ea3d2c21fcbd67164af8d5d968 (patch)
tree97262d6fe68846bffd0ebdb303403b4da9ed4ee1 /src/libstd/sys/cloudabi/thread.rs
parent1cdcea920e56a5d0587307a4c9cf8fff5c77c4bc (diff)
parent6e8fabb4ac16b30c98968b768b860d2c2e1583d8 (diff)
downloadrust-f7af19c279b8b7ea3d2c21fcbd67164af8d5d968.tar.gz
rust-f7af19c279b8b7ea3d2c21fcbd67164af8d5d968.zip
Auto merge of #63592 - Centril:rollup-7c6dg3e, r=Centril
Rollup of 9 pull requests

Successful merges:

 - #63155 (Add UWP MSVC targets)
 - #63165 (Add builtin targets for mips64(el)-unknown-linux-muslabi64)
 - #63306 (Adapt AddRetag for shallow retagging)
 - #63467 (Add Catalyst (iOS apps running on macOS) target)
 - #63546 (Remove uses of `mem::uninitialized()` from cloudabi)
 - #63572 (remove unused Level::PhaseFatal)
 - #63577 (Test HRTB issue accepted by compiler)
 - #63582 (Fix ICE #63226)
 - #63586 (cleanup: Remove `Spanned` where possible)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd/sys/cloudabi/thread.rs')
-rw-r--r--src/libstd/sys/cloudabi/thread.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libstd/sys/cloudabi/thread.rs b/src/libstd/sys/cloudabi/thread.rs
index 7da16c4d247..240b6ea9e57 100644
--- a/src/libstd/sys/cloudabi/thread.rs
+++ b/src/libstd/sys/cloudabi/thread.rs
@@ -72,10 +72,11 @@ impl Thread {
                 },
                 ..mem::zeroed()
             };
-            let mut event: abi::event = mem::uninitialized();
-            let mut nevents: usize = mem::uninitialized();
-            let ret = abi::poll(&subscription, &mut event, 1, &mut nevents);
+            let mut event = mem::MaybeUninit::<abi::event>::uninit();
+            let mut nevents = mem::MaybeUninit::<usize>::uninit();
+            let ret = abi::poll(&subscription, event.as_mut_ptr(), 1, nevents.as_mut_ptr());
             assert_eq!(ret, abi::errno::SUCCESS);
+            let event = event.assume_init();
             assert_eq!(event.error, abi::errno::SUCCESS);
         }
     }