Skip to content

Commit 7e4cfbc

Browse files
workingjubileeworkingjubilee
authored
Rollup merge of rust-lang#130164 - RalfJung:const_ptr_as_ref, r=dtolnay
move some const fn out of the const_ptr_as_ref feature When a `const fn` is still `#[unstable]`, it should generally use the same feature to track its regular stability and const-stability. Then when that feature moves towards stabilization we can decide whether the const-ness can be stabilized as well, or whether it should be moved into a new feature. Also, functions like `ptr::as_ref` (which returns an `Option<&mut T>`) require `is_null`, which is tricky and blocked on some design concerns (see rust-lang#74939). So move those to the is_null feature gate, as they should be stabilized together with `ptr.is_null()`. Affects rust-lang#91822, rust-lang#122034, rust-lang#75402, rust-lang#74939
2 parents 3fdbce0 + 41cd571 commit 7e4cfbc

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

‎core/src/ptr/const_ptr.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ impl<T: ?Sized> *const T {
270270
/// }
271271
/// ```
272272
#[stable(feature = "ptr_as_ref", since = "1.9.0")]
273-
#[rustc_const_unstable(feature = "const_ptr_as_ref", issue = "91822")]
273+
#[rustc_const_unstable(feature = "const_ptr_is_null", issue = "74939")]
274274
#[inline]
275275
pub const unsafe fn as_ref<'a>(self) -> Option<&'a T> {
276276
// SAFETY: the caller must guarantee that `self` is valid
@@ -302,7 +302,7 @@ impl<T: ?Sized> *const T {
302302
/// ```
303303
// FIXME: mention it in the docs for `as_ref` and `as_uninit_ref` once stabilized.
304304
#[unstable(feature = "ptr_as_ref_unchecked", issue = "122034")]
305-
#[rustc_const_unstable(feature = "const_ptr_as_ref", issue = "91822")]
305+
#[rustc_const_unstable(feature = "ptr_as_ref_unchecked", issue = "122034")]
306306
#[inline]
307307
#[must_use]
308308
pub const unsafe fn as_ref_unchecked<'a>(self) -> &'a T {
@@ -336,7 +336,7 @@ impl<T: ?Sized> *const T {
336336
/// ```
337337
#[inline]
338338
#[unstable(feature = "ptr_as_uninit", issue = "75402")]
339-
#[rustc_const_unstable(feature = "const_ptr_as_ref", issue = "91822")]
339+
#[rustc_const_unstable(feature = "ptr_as_uninit", issue = "75402")]
340340
pub const unsafe fn as_uninit_ref<'a>(self) -> Option<&'a MaybeUninit<T>>
341341
where
342342
T: Sized,
@@ -1664,7 +1664,7 @@ impl<T> *const [T] {
16641664
/// [allocated object]: crate::ptr#allocated-object
16651665
#[inline]
16661666
#[unstable(feature = "ptr_as_uninit", issue = "75402")]
1667-
#[rustc_const_unstable(feature = "const_ptr_as_ref", issue = "91822")]
1667+
#[rustc_const_unstable(feature = "ptr_as_uninit", issue = "75402")]
16681668
pub const unsafe fn as_uninit_slice<'a>(self) -> Option<&'a [MaybeUninit<T>]> {
16691669
if self.is_null() {
16701670
None

‎core/src/ptr/mut_ptr.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ impl<T: ?Sized> *mut T {
261261
/// }
262262
/// ```
263263
#[stable(feature = "ptr_as_ref", since = "1.9.0")]
264-
#[rustc_const_unstable(feature = "const_ptr_as_ref", issue = "91822")]
264+
#[rustc_const_unstable(feature = "const_ptr_is_null", issue = "74939")]
265265
#[inline]
266266
pub const unsafe fn as_ref<'a>(self) -> Option<&'a T> {
267267
// SAFETY: the caller must guarantee that `self` is valid for a
@@ -295,7 +295,7 @@ impl<T: ?Sized> *mut T {
295295
/// ```
296296
// FIXME: mention it in the docs for `as_ref` and `as_uninit_ref` once stabilized.
297297
#[unstable(feature = "ptr_as_ref_unchecked", issue = "122034")]
298-
#[rustc_const_unstable(feature = "const_ptr_as_ref", issue = "91822")]
298+
#[rustc_const_unstable(feature = "ptr_as_ref_unchecked", issue = "122034")]
299299
#[inline]
300300
#[must_use]
301301
pub const unsafe fn as_ref_unchecked<'a>(self) -> &'a T {
@@ -334,7 +334,7 @@ impl<T: ?Sized> *mut T {
334334
/// ```
335335
#[inline]
336336
#[unstable(feature = "ptr_as_uninit", issue = "75402")]
337-
#[rustc_const_unstable(feature = "const_ptr_as_ref", issue = "91822")]
337+
#[rustc_const_unstable(feature = "ptr_as_uninit", issue = "75402")]
338338
pub const unsafe fn as_uninit_ref<'a>(self) -> Option<&'a MaybeUninit<T>>
339339
where
340340
T: Sized,
@@ -580,7 +580,7 @@ impl<T: ?Sized> *mut T {
580580
/// println!("{s:?}"); // It'll print: "[4, 2, 3]".
581581
/// ```
582582
#[stable(feature = "ptr_as_ref", since = "1.9.0")]
583-
#[rustc_const_unstable(feature = "const_ptr_as_ref", issue = "91822")]
583+
#[rustc_const_unstable(feature = "const_ptr_is_null", issue = "74939")]
584584
#[inline]
585585
pub const unsafe fn as_mut<'a>(self) -> Option<&'a mut T> {
586586
// SAFETY: the caller must guarantee that `self` is be valid for
@@ -616,7 +616,7 @@ impl<T: ?Sized> *mut T {
616616
/// ```
617617
// FIXME: mention it in the docs for `as_mut` and `as_uninit_mut` once stabilized.
618618
#[unstable(feature = "ptr_as_ref_unchecked", issue = "122034")]
619-
#[rustc_const_unstable(feature = "const_ptr_as_ref", issue = "91822")]
619+
#[rustc_const_unstable(feature = "ptr_as_ref_unchecked", issue = "122034")]
620620
#[inline]
621621
#[must_use]
622622
pub const unsafe fn as_mut_unchecked<'a>(self) -> &'a mut T {
@@ -639,7 +639,7 @@ impl<T: ?Sized> *mut T {
639639
/// the pointer is [convertible to a reference](crate::ptr#pointer-to-reference-conversion).
640640
#[inline]
641641
#[unstable(feature = "ptr_as_uninit", issue = "75402")]
642-
#[rustc_const_unstable(feature = "const_ptr_as_ref", issue = "91822")]
642+
#[rustc_const_unstable(feature = "ptr_as_uninit", issue = "75402")]
643643
pub const unsafe fn as_uninit_mut<'a>(self) -> Option<&'a mut MaybeUninit<T>>
644644
where
645645
T: Sized,
@@ -2016,7 +2016,7 @@ impl<T> *mut [T] {
20162016
/// [allocated object]: crate::ptr#allocated-object
20172017
#[inline]
20182018
#[unstable(feature = "ptr_as_uninit", issue = "75402")]
2019-
#[rustc_const_unstable(feature = "const_ptr_as_ref", issue = "91822")]
2019+
#[rustc_const_unstable(feature = "ptr_as_uninit", issue = "75402")]
20202020
pub const unsafe fn as_uninit_slice<'a>(self) -> Option<&'a [MaybeUninit<T>]> {
20212021
if self.is_null() {
20222022
None
@@ -2068,7 +2068,7 @@ impl<T> *mut [T] {
20682068
/// [allocated object]: crate::ptr#allocated-object
20692069
#[inline]
20702070
#[unstable(feature = "ptr_as_uninit", issue = "75402")]
2071-
#[rustc_const_unstable(feature = "const_ptr_as_ref", issue = "91822")]
2071+
#[rustc_const_unstable(feature = "ptr_as_uninit", issue = "75402")]
20722072
pub const unsafe fn as_uninit_slice_mut<'a>(self) -> Option<&'a mut [MaybeUninit<T>]> {
20732073
if self.is_null() {
20742074
None

‎core/src/ptr/non_null.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ impl<T: Sized> NonNull<T> {
133133
#[inline]
134134
#[must_use]
135135
#[unstable(feature = "ptr_as_uninit", issue = "75402")]
136-
#[rustc_const_unstable(feature = "const_ptr_as_ref", issue = "91822")]
136+
#[rustc_const_unstable(feature = "ptr_as_uninit", issue = "75402")]
137137
pub const unsafe fn as_uninit_ref<'a>(self) -> &'a MaybeUninit<T> {
138138
// SAFETY: the caller must guarantee that `self` meets all the
139139
// requirements for a reference.
@@ -157,7 +157,7 @@ impl<T: Sized> NonNull<T> {
157157
#[inline]
158158
#[must_use]
159159
#[unstable(feature = "ptr_as_uninit", issue = "75402")]
160-
#[rustc_const_unstable(feature = "const_ptr_as_ref", issue = "91822")]
160+
#[rustc_const_unstable(feature = "ptr_as_uninit", issue = "75402")]
161161
pub const unsafe fn as_uninit_mut<'a>(self) -> &'a mut MaybeUninit<T> {
162162
// SAFETY: the caller must guarantee that `self` meets all the
163163
// requirements for a reference.
@@ -1563,7 +1563,7 @@ impl<T> NonNull<[T]> {
15631563
#[inline]
15641564
#[must_use]
15651565
#[unstable(feature = "ptr_as_uninit", issue = "75402")]
1566-
#[rustc_const_unstable(feature = "const_ptr_as_ref", issue = "91822")]
1566+
#[rustc_const_unstable(feature = "ptr_as_uninit", issue = "75402")]
15671567
pub const unsafe fn as_uninit_slice<'a>(self) -> &'a [MaybeUninit<T>] {
15681568
// SAFETY: the caller must uphold the safety contract for `as_uninit_slice`.
15691569
unsafe { slice::from_raw_parts(self.cast().as_ptr(), self.len()) }
@@ -1628,7 +1628,7 @@ impl<T> NonNull<[T]> {
16281628
#[inline]
16291629
#[must_use]
16301630
#[unstable(feature = "ptr_as_uninit", issue = "75402")]
1631-
#[rustc_const_unstable(feature = "const_ptr_as_ref", issue = "91822")]
1631+
#[rustc_const_unstable(feature = "ptr_as_uninit", issue = "75402")]
16321632
pub const unsafe fn as_uninit_slice_mut<'a>(self) -> &'a mut [MaybeUninit<T>] {
16331633
// SAFETY: the caller must uphold the safety contract for `as_uninit_slice_mut`.
16341634
unsafe { slice::from_raw_parts_mut(self.cast().as_ptr(), self.len()) }

0 commit comments

Comments
 (0)