diff options
| author | bors <bors@rust-lang.org> | 2019-02-10 20:03:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-10 20:03:03 +0000 |
| commit | 0b7af2668a80fb2fa720a06ca44aff4dd1e9de38 (patch) | |
| tree | 41114c4ae8ddaf8f0d7ac4bbd6bce36006310fa2 /src/libstd | |
| parent | c3d2490433aa675b850d54cac3beed0977074637 (diff) | |
| parent | 4833074a9a47c12bcfeee4435bf981981ede689c (diff) | |
| download | rust-0b7af2668a80fb2fa720a06ca44aff4dd1e9de38.tar.gz rust-0b7af2668a80fb2fa720a06ca44aff4dd1e9de38.zip | |
Auto merge of #58129 - RalfJung:maybe-uninit, r=cramertj
MaybeUninit: some docs, rename into_inner -> into_initialized, return &mut from set
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/sgx/ext/arch.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/sgx/ext/arch.rs b/src/libstd/sys/sgx/ext/arch.rs index 3bd87b5d265..97f7d9181a5 100644 --- a/src/libstd/sys/sgx/ext/arch.rs +++ b/src/libstd/sys/sgx/ext/arch.rs @@ -41,7 +41,7 @@ pub fn egetkey(request: &Align512<[u8; 512]>) -> Result<Align16<[u8; 16]>, u32> ); match error { - 0 => Ok(out.into_inner()), + 0 => Ok(out.into_initialized()), err => Err(err), } } @@ -69,6 +69,6 @@ pub fn ereport( "{rdx}"(report.as_mut_ptr()) ); - report.into_inner() + report.into_initialized() } } |