bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make Option::as_[mut_]slice const

Browse source
This commit is contained in:
George Bateman 2024-06-19 21:44:47 +01:00
parent 5c8459f1ec
commit 35c65a8c0c
No known key found for this signature in database
GPG key ID: C417AA9C4039EFCF
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
library/core/src/option.rs
View file

@ -797,7 +797,8 @@ impl<T> Option<T> {
#[inline] #[inline]
#[must_use] #[must_use]
#[stable(feature = "option_as_slice", since = "1.75.0")] #[stable(feature = "option_as_slice", since = "1.75.0")]
pub fn as_slice(&self) -> &[T] { #[rustc_const_unstable(feature = "const_option_ext", issue = "91930")]
pub const fn as_slice(&self) -> &[T] {
// SAFETY: When the `Option` is `Some`, we're using the actual pointer // SAFETY: When the `Option` is `Some`, we're using the actual pointer
// to the payload, with a length of 1, so this is equivalent to // to the payload, with a length of 1, so this is equivalent to
// `slice::from_ref`, and thus is safe. // `slice::from_ref`, and thus is safe.
@ -811,7 +812,7 @@ impl<T> Option<T> {
unsafe { unsafe {
slice::from_raw_parts( slice::from_raw_parts(
(self as *const Self).byte_add(core::mem::offset_of!(Self, Some.0)).cast(), (self as *const Self).byte_add(core::mem::offset_of!(Self, Some.0)).cast(),
usize::from(self.is_some()), self.is_some() as usize,
) )
} }
} }
@ -851,7 +852,8 @@ impl<T> Option<T> {
#[inline] #[inline]
#[must_use] #[must_use]
#[stable(feature = "option_as_slice", since = "1.75.0")] #[stable(feature = "option_as_slice", since = "1.75.0")]
pub fn as_mut_slice(&mut self) -> &mut [T] { #[rustc_const_unstable(feature = "const_option_ext", issue = "91930")]
pub const fn as_mut_slice(&mut self) -> &mut [T] {
// SAFETY: When the `Option` is `Some`, we're using the actual pointer // SAFETY: When the `Option` is `Some`, we're using the actual pointer
// to the payload, with a length of 1, so this is equivalent to // to the payload, with a length of 1, so this is equivalent to
// `slice::from_mut`, and thus is safe. // `slice::from_mut`, and thus is safe.
@ -867,7 +869,7 @@ impl<T> Option<T> {
unsafe { unsafe {
slice::from_raw_parts_mut( slice::from_raw_parts_mut(
(self as *mut Self).byte_add(core::mem::offset_of!(Self, Some.0)).cast(), (self as *mut Self).byte_add(core::mem::offset_of!(Self, Some.0)).cast(),
usize::from(self.is_some()), self.is_some() as usize,
) )
} }
} }

9
library/core/tests/option.rs
View file

@ -574,4 +574,13 @@ fn as_slice() {
assert_eq!(Some(43).as_mut_slice(), &[43]); assert_eq!(Some(43).as_mut_slice(), &[43]);
assert_eq!(None::<i32>.as_slice(), &[]); assert_eq!(None::<i32>.as_slice(), &[]);
assert_eq!(None::<i32>.as_mut_slice(), &[]); assert_eq!(None::<i32>.as_mut_slice(), &[]);
const A: &[u32] = Some(44).as_slice();
const B: &[u32] = None.as_slice();
const _: () = {
let [45] = Some(45).as_mut_slice() else { panic!() };
let []: &[u32] = None.as_mut_slice() else { panic!() };
};
assert_eq!(A, &[44]);
assert_eq!(B, &[]);
} }