Rollup merge of rust-lang#134116 - RalfJung:const_nonnull_new, r=jhpratt

stabilize const_nonnull_new FCP passed in rust-lang#93235 Closes rust-lang#93235
fmease · Dec 10, 2024 · 386fe81 · 386fe81
2 parents cf704d1 + a8d11ea
commit 386fe81
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/library/core/src/ptr/non_null.rs b/library/core/src/ptr/non_null.rs
@@ -217,7 +217,7 @@ impl<T: ?Sized> NonNull<T> {
     /// }
     /// ```
     #[stable(feature = "nonnull", since = "1.25.0")]
-    #[rustc_const_unstable(feature = "const_nonnull_new", issue = "93235")]
+    #[rustc_const_stable(feature = "const_nonnull_new", since = "CURRENT_RUSTC_VERSION")]
     #[inline]
     pub const fn new(ptr: *mut T) -> Option<Self> {
         if !ptr.is_null() {

diff --git a/library/core/src/ptr/unique.rs b/library/core/src/ptr/unique.rs
@@ -92,8 +92,6 @@ impl<T: ?Sized> Unique<T> {
 
     /// Creates a new `Unique` if `ptr` is non-null.
     #[inline]
-    // rustc_const_unstable attribute can be removed when `const_nonnull_new` is stable
-    #[rustc_const_unstable(feature = "ptr_internals", issue = "none")]
     pub const fn new(ptr: *mut T) -> Option<Self> {
         if let Some(pointer) = NonNull::new(ptr) {
             Some(Unique { pointer, _marker: PhantomData })

diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs
@@ -15,7 +15,6 @@
 #![feature(clone_to_uninit)]
 #![feature(const_black_box)]
 #![feature(const_eval_select)]
-#![feature(const_nonnull_new)]
 #![feature(const_swap)]
 #![feature(const_trait_impl)]
 #![feature(core_intrinsics)]