mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #60244 - SimonSapin:dangling, r=oli-obk

Browse Source 
const-stabilize NonNull::dangling and NonNull::cast
This commit is contained in:
bors 2019-05-12 14:32:11 +00:00
commit 0df1e57991
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcore/ptr.rs
View File

@ -2970,7 +2970,6 @@ impl<T: Sized> NonNull<T> {
/// some other means.
#[stable(feature = "nonnull", since = "1.25.0")]
#[inline]
#[rustc_const_unstable(feature = "const_ptr_nonnull")]
pub const fn dangling() -> Self {
unsafe {
let ptr = mem::align_of::<T>() as *mut T;
@ -3034,7 +3033,6 @@ impl<T: ?Sized> NonNull<T> {
/// Cast to a pointer of another type
#[stable(feature = "nonnull_cast", since = "1.27.0")]
#[inline]
#[rustc_const_unstable(feature = "const_ptr_nonnull")]
pub const fn cast<U>(self) -> NonNull<U> {
unsafe {
NonNull::new_unchecked(self.as_ptr() as *mut U)

2
src/test/run-pass/consts/const-ptr-nonnull.rs
View File

@ -1,7 +1,5 @@
// run-pass
#![feature(const_ptr_nonnull)]
use std::ptr::NonNull;
const DANGLING: NonNull<u32> = NonNull::dangling();