diff options
| author | bors <bors@rust-lang.org> | 2019-03-28 02:00:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-28 02:00:57 +0000 |
| commit | d20e0002725d2b3efff23c97450806b3517ba804 (patch) | |
| tree | 30dcba1cf4ff7e25de3fd495278e0458ba6c5c98 /src/libstd/sys | |
| parent | 33ef0bad21d6bb646c7c3ab0dbf381ca96c324bf (diff) | |
| parent | a2c4562690db552c845804223e302d42efd48c98 (diff) | |
| download | rust-d20e0002725d2b3efff23c97450806b3517ba804.tar.gz rust-d20e0002725d2b3efff23c97450806b3517ba804.zip | |
Auto merge of #59471 - cuviper:rollup, r=cuviper
Rollup of 18 pull requests
Successful merges:
- #57293 (Make some lints incremental)
- #57565 (syntax: Remove warning for unnecessary path disambiguators)
- #58253 (librustc_driver => 2018)
- #58837 (librustc_interface => 2018)
- #59268 (Add suggestion to use `&*var` when `&str: From<String>` is expected)
- #59283 (Make ASCII case conversions more than 4× faster)
- #59284 (adjust MaybeUninit API to discussions)
- #59372 (add rustfix-able suggestions to trim_{left,right} deprecations)
- #59390 (Make `ptr::eq` documentation mention fat-pointer behavior)
- #59393 (Refactor tuple comparison tests)
- #59420 ([CI] record docker image info for reuse)
- #59421 (Reject integer suffix when tuple indexing)
- #59430 (Renames `EvalContext` to `InterpretCx`)
- #59439 (Generalize diagnostic for `x = y` where `bool` is the expected type)
- #59449 (fix: Make incremental artifact deletion more robust)
- #59451 (Add `Default` to `std::alloc::System`)
- #59459 (Add some tests)
- #59460 (Include id in Thread's Debug implementation)
Failed merges:
r? @ghost
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/sgx/ext/arch.rs | 8 | ||||
| -rw-r--r-- | src/libstd/sys/sgx/rwlock.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/mutex.rs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/libstd/sys/sgx/ext/arch.rs b/src/libstd/sys/sgx/ext/arch.rs index 53fb371947a..5056e388112 100644 --- a/src/libstd/sys/sgx/ext/arch.rs +++ b/src/libstd/sys/sgx/ext/arch.rs @@ -28,7 +28,7 @@ const ENCLU_EGETKEY: u32 = 1; #[unstable(feature = "sgx_platform", issue = "56975")] pub fn egetkey(request: &Align512<[u8; 512]>) -> Result<Align16<[u8; 16]>, u32> { unsafe { - let mut out = MaybeUninit::uninitialized(); + let mut out = MaybeUninit::uninit(); let error; asm!( @@ -41,7 +41,7 @@ pub fn egetkey(request: &Align512<[u8; 512]>) -> Result<Align16<[u8; 16]>, u32> ); match error { - 0 => Ok(out.into_initialized()), + 0 => Ok(out.assume_init()), err => Err(err), } } @@ -58,7 +58,7 @@ pub fn ereport( reportdata: &Align128<[u8; 64]>, ) -> Align512<[u8; 432]> { unsafe { - let mut report = MaybeUninit::uninitialized(); + let mut report = MaybeUninit::uninit(); asm!( "enclu" @@ -69,6 +69,6 @@ pub fn ereport( "{rdx}"(report.as_mut_ptr()) ); - report.into_initialized() + report.assume_init() } } diff --git a/src/libstd/sys/sgx/rwlock.rs b/src/libstd/sys/sgx/rwlock.rs index 7b113267865..7e2d13b9e24 100644 --- a/src/libstd/sys/sgx/rwlock.rs +++ b/src/libstd/sys/sgx/rwlock.rs @@ -280,7 +280,7 @@ mod tests { let mut init = MaybeUninit::<RWLock>::zeroed(); rwlock_new(&mut init); assert_eq!( - mem::transmute::<_, [u8; 128]>(init.into_initialized()).as_slice(), + mem::transmute::<_, [u8; 128]>(init.assume_init()).as_slice(), RWLOCK_INIT ) }; diff --git a/src/libstd/sys/windows/mutex.rs b/src/libstd/sys/windows/mutex.rs index 1aa910f05c9..37cbdcefced 100644 --- a/src/libstd/sys/windows/mutex.rs +++ b/src/libstd/sys/windows/mutex.rs @@ -154,7 +154,7 @@ unsafe impl Sync for ReentrantMutex {} impl ReentrantMutex { pub fn uninitialized() -> ReentrantMutex { - ReentrantMutex { inner: UnsafeCell::new(MaybeUninit::uninitialized()) } + ReentrantMutex { inner: UnsafeCell::new(MaybeUninit::uninit()) } } pub unsafe fn init(&mut self) { |
