diff options
| author | Tatsuyuki Ishi <ishitatsuyuki@gmail.com> | 2019-08-07 13:19:07 +0900 |
|---|---|---|
| committer | Tatsuyuki Ishi <ishitatsuyuki@gmail.com> | 2019-08-10 22:16:35 +0900 |
| commit | 2358e3eff604a770d5dabab9680d81148106fd68 (patch) | |
| tree | 9d17df8a859b78bab19b8aaefe33c43b854eaafc /src/libcore/mem | |
| parent | c326c2e0f1761d133f295a8fe6d2b5a0b7ac6f91 (diff) | |
Revert "Rollup merge of #62150 - alex:mem-uninit-refactor, r=RalfJung"
This reverts commit 1d45156866b54c3fc36edfdfcdd8149ad9cb5711, reversing changes made to 0f92eb8a4a7d8715381f5b5d748d22315f6ff9c7.
Diffstat (limited to 'src/libcore/mem')
| -rw-r--r-- | src/libcore/mem/mod.rs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/libcore/mem/mod.rs b/src/libcore/mem/mod.rs index 86dae985fdb..2b462f08d42 100644 --- a/src/libcore/mem/mod.rs +++ b/src/libcore/mem/mod.rs @@ -452,8 +452,11 @@ pub const fn needs_drop<T>() -> bool { /// ``` #[inline] #[stable(feature = "rust1", since = "1.0.0")] +#[cfg_attr(bootstrap, allow(deprecated_in_future))] +#[allow(deprecated)] pub unsafe fn zeroed<T>() -> T { - MaybeUninit::zeroed().assume_init() + intrinsics::panic_if_uninhabited::<T>(); + intrinsics::init() } /// Bypasses Rust's normal memory-initialization checks by pretending to @@ -477,8 +480,11 @@ pub unsafe fn zeroed<T>() -> T { #[inline] #[rustc_deprecated(since = "1.39.0", reason = "use `mem::MaybeUninit` instead")] #[stable(feature = "rust1", since = "1.0.0")] +#[cfg_attr(bootstrap, allow(deprecated_in_future))] +#[allow(deprecated)] pub unsafe fn uninitialized<T>() -> T { - MaybeUninit::uninit().assume_init() + intrinsics::panic_if_uninhabited::<T>(); + intrinsics::uninit() } /// Swaps the values at two mutable locations, without deinitializing either one. |