bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #103329 - saethlin:nonnull-precondition, r=thomcc

Browse source 
Add a forgotten check for NonNull::new_unchecked's precondition

Looks like I forgot this function a while ago in https://github.com/rust-lang/rust/pull/92686

r? ```@thomcc```
This commit is contained in:
Dylan DPC 2022-10-22 16:28:08 +05:30 • committed by GitHub
commit 3f49f9506f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
library/core/src/ptr/non_null.rs
View file

@ -2,6 +2,7 @@ use crate::cmp::Ordering;
use crate::convert::From; use crate::convert::From;
use crate::fmt; use crate::fmt;
use crate::hash; use crate::hash;
use crate::intrinsics::assert_unsafe_precondition;
use crate::marker::Unsize; use crate::marker::Unsize;
use crate::mem::{self, MaybeUninit}; use crate::mem::{self, MaybeUninit};
use crate::num::NonZeroUsize; use crate::num::NonZeroUsize;
@ -195,7 +196,10 @@ impl<T: ?Sized> NonNull<T> {
#[inline] #[inline]
pub const unsafe fn new_unchecked(ptr: *mut T) -> Self { pub const unsafe fn new_unchecked(ptr: *mut T) -> Self {
// SAFETY: the caller must guarantee that `ptr` is non-null. // SAFETY: the caller must guarantee that `ptr` is non-null.
unsafe { NonNull { pointer: ptr as _ } } unsafe {
assert_unsafe_precondition!([T: ?Sized](ptr: *mut T) => !ptr.is_null());
NonNull { pointer: ptr as _ }
}
} }
/// Creates a new `NonNull` if `ptr` is non-null. /// Creates a new `NonNull` if `ptr` is non-null.