diff options
| author | bors <bors@rust-lang.org> | 2019-07-05 18:27:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-05 18:27:52 +0000 |
| commit | 481068a707679257e2a738b40987246e0420e787 (patch) | |
| tree | c269c3e16e3a69f5d1df500cd18e03c270ce7e77 /src/libstd/sys | |
| parent | 853f30052d019a8ebe197a5adff3a29d6716a955 (diff) | |
| parent | e89bd8c3089eb8e3b85e989352f7cfb73733c76b (diff) | |
| download | rust-481068a707679257e2a738b40987246e0420e787.tar.gz rust-481068a707679257e2a738b40987246e0420e787.zip | |
Auto merge of #62419 - Centril:rollup-82umycq, r=Centril
Rollup of 13 pull requests Successful merges: - #61545 (Implement another internal lints) - #62110 (Improve -Ztime-passes) - #62133 (Feature gate `rustc` attributes harder) - #62158 (Add MemoryExtra in InterpretCx constructor params) - #62168 (The (almost) culmination of HirIdification) - #62193 (Create async version of the dynamic-drop test) - #62369 (Remove `compile-pass` from compiletest) - #62380 (rustc_target: avoid negative register counts in the SysV x86_64 ABI.) - #62381 (Fix a typo in Write::write_vectored docs) - #62390 (Update README.md) - #62396 (remove Scalar::is_null_ptr) - #62406 (Lint on invalid values passed to x.py --warnings) - #62414 (Remove last use of mem::uninitialized in SGX) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/sgx/mod.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libstd/sys/sgx/mod.rs b/src/libstd/sys/sgx/mod.rs index 3bf9ecf4080..601957acd5c 100644 --- a/src/libstd/sys/sgx/mod.rs +++ b/src/libstd/sys/sgx/mod.rs @@ -3,8 +3,6 @@ //! This module contains the facade (aka platform-specific) implementations of //! OS level functionality for Fortanix SGX. -#![allow(deprecated)] - use crate::io::ErrorKind; use crate::os::raw::c_char; use crate::sync::atomic::{AtomicBool, Ordering}; @@ -142,7 +140,7 @@ pub unsafe extern "C" fn __rust_abort() { pub fn hashmap_random_keys() -> (u64, u64) { fn rdrand64() -> u64 { unsafe { - let mut ret: u64 = crate::mem::uninitialized(); + let mut ret: u64 = 0; for _ in 0..10 { if crate::arch::x86_64::_rdrand64_step(&mut ret) == 1 { return ret; |
