stabilize derive(CoercePointee)

dingxiangfei2009 · dingxiangfei2009 · commit eee7af7ddf27 · 2025-07-03T22:09:51.000+02:00
diff --git a/library/core/src/marker.rs b/library/core/src/marker.rs
@@ -1190,7 +1190,6 @@ pub trait FnPtr: Copy + Clone {
 ///
 /// By using the macro, the following example will compile:
 /// ```
-/// #![feature(derive_coerce_pointee)]
 /// use std::marker::CoercePointee;
 /// use std::ops::Deref;
 ///
@@ -1237,7 +1236,7 @@ pub trait FnPtr: Copy + Clone {
 /// type as a receiver are dyn-compatible. For example, this compiles:
 ///
 /// ```
-/// #![feature(arbitrary_self_types, derive_coerce_pointee)]
+/// #![feature(arbitrary_self_types)]
 /// use std::marker::CoercePointee;
 /// use std::ops::Deref;
 ///
@@ -1299,7 +1298,6 @@ pub trait FnPtr: Copy + Clone {
 /// If the type has multiple type parameters, then you must explicitly specify which one should be
 /// used for dynamic dispatch. For example:
 /// ```
-/// # #![feature(derive_coerce_pointee)]
 /// # use std::marker::{CoercePointee, PhantomData};
 /// #[derive(CoercePointee)]
 /// #[repr(transparent)]
@@ -1314,7 +1312,6 @@ pub trait FnPtr: Copy + Clone {
 ///
 /// A custom implementation of the `Rc` type:
 /// ```
-/// #![feature(derive_coerce_pointee)]
 /// use std::marker::CoercePointee;
 /// use std::ops::Deref;
 /// use std::ptr::NonNull;
@@ -1371,7 +1368,7 @@ pub trait FnPtr: Copy + Clone {
 #[rustc_builtin_macro(CoercePointee, attributes(pointee))]
 #[allow_internal_unstable(dispatch_from_dyn, coerce_unsized, unsize, coerce_pointee_validated)]
 #[rustc_diagnostic_item = "CoercePointee"]
-#[unstable(feature = "derive_coerce_pointee", issue = "123430")]
+#[stable(feature = "derive_coerce_pointee", since = "CURRENT_RUSTC_VERSION")]
 pub macro CoercePointee($item:item) {
     /* compiler built-in */
 }
diff --git a/src/tools/miri/src/lib.rs b/src/tools/miri/src/lib.rs
@@ -13,7 +13,7 @@
 #![feature(pointer_is_aligned_to)]
 #![feature(ptr_metadata)]
 #![feature(unqualified_local_imports)]
-#![feature(derive_coerce_pointee)]
+#![cfg_attr(bootstrap, feature(derive_coerce_pointee))]
 #![feature(arbitrary_self_types)]
 // Configure clippy and other lints
 #![allow(
diff --git a/tests/ui/deriving/built-in-proc-macro-scope.rs b/tests/ui/deriving/built-in-proc-macro-scope.rs
@@ -3,8 +3,6 @@
 //@ compile-flags: -Zunpretty=expanded
 //@ edition:2015
 
-#![feature(derive_coerce_pointee)]
-
 #[macro_use]
 extern crate another_proc_macro;
 
diff --git a/tests/ui/deriving/built-in-proc-macro-scope.stdout b/tests/ui/deriving/built-in-proc-macro-scope.stdout
@@ -1,15 +1,13 @@
 #![feature(prelude_import)]
 #![no_std]
-//@ check-pass
-//@ proc-macro: another-proc-macro.rs
-//@ compile-flags: -Zunpretty=expanded
-//@ edition:2015
-
-#![feature(derive_coerce_pointee)]
 #[prelude_import]
 use ::std::prelude::rust_2015::*;
 #[macro_use]
 extern crate std;
+//@ check-pass
+//@ proc-macro: another-proc-macro.rs
+//@ compile-flags: -Zunpretty=expanded
+//@ edition:2015
 
 #[macro_use]
 extern crate another_proc_macro;
diff --git a/tests/ui/deriving/coerce-pointee-bounds-issue-127647.rs b/tests/ui/deriving/coerce-pointee-bounds-issue-127647.rs
@@ -1,7 +1,5 @@
 //@ check-pass
 
-#![feature(derive_coerce_pointee)]
-
 #[derive(core::marker::CoercePointee)]
 #[repr(transparent)]
 pub struct Ptr<'a, #[pointee] T: OnDrop + ?Sized, X> {
diff --git a/tests/ui/deriving/deriving-coerce-pointee-expanded.rs b/tests/ui/deriving/deriving-coerce-pointee-expanded.rs
@@ -1,7 +1,6 @@
 //@ check-pass
 //@ compile-flags: -Zunpretty=expanded
 //@ edition: 2015
-#![feature(derive_coerce_pointee)]
 use std::marker::CoercePointee;
 
 pub trait MyTrait<T: ?Sized> {}
diff --git a/tests/ui/deriving/deriving-coerce-pointee-expanded.stdout b/tests/ui/deriving/deriving-coerce-pointee-expanded.stdout
@@ -1,13 +1,12 @@
 #![feature(prelude_import)]
 #![no_std]
-//@ check-pass
-//@ compile-flags: -Zunpretty=expanded
-//@ edition: 2015
-#![feature(derive_coerce_pointee)]
 #[prelude_import]
 use ::std::prelude::rust_2015::*;
 #[macro_use]
 extern crate std;
+//@ check-pass
+//@ compile-flags: -Zunpretty=expanded
+//@ edition: 2015
 use std::marker::CoercePointee;
 
 pub trait MyTrait<T: ?Sized> {}
diff --git a/tests/ui/deriving/deriving-coerce-pointee-neg.rs b/tests/ui/deriving/deriving-coerce-pointee-neg.rs
@@ -1,5 +1,5 @@
 //@ proc-macro: malicious-macro.rs
-#![feature(derive_coerce_pointee, arbitrary_self_types)]
+#![feature(arbitrary_self_types)]
 
 extern crate core;
 extern crate malicious_macro;
diff --git a/tests/ui/deriving/deriving-coerce-pointee.rs b/tests/ui/deriving/deriving-coerce-pointee.rs
@@ -1,5 +1,6 @@
 //@ run-pass
-#![feature(derive_coerce_pointee, arbitrary_self_types)]
+
+#![feature(arbitrary_self_types)]
 
 use std::marker::CoercePointee;
 
diff --git a/tests/ui/deriving/proc-macro-attribute-mixing.rs b/tests/ui/deriving/proc-macro-attribute-mixing.rs
@@ -9,8 +9,6 @@
 //@ compile-flags: -Zunpretty=expanded
 //@ edition: 2015
 
-#![feature(derive_coerce_pointee)]
-
 #[macro_use]
 extern crate another_proc_macro;
 
diff --git a/tests/ui/deriving/proc-macro-attribute-mixing.stdout b/tests/ui/deriving/proc-macro-attribute-mixing.stdout
@@ -1,5 +1,9 @@
 #![feature(prelude_import)]
 #![no_std]
+#[prelude_import]
+use ::std::prelude::rust_2015::*;
+#[macro_use]
+extern crate std;
 // This test certify that we can mix attribute macros from Rust and external proc-macros.
 // For instance, `#[derive(Default)]` uses `#[default]` and `#[derive(CoercePointee)]` uses
 // `#[pointee]`.
@@ -11,12 +15,6 @@
 //@ compile-flags: -Zunpretty=expanded
 //@ edition: 2015
 
-#![feature(derive_coerce_pointee)]
-#[prelude_import]
-use ::std::prelude::rust_2015::*;
-#[macro_use]
-extern crate std;
-
 #[macro_use]
 extern crate another_proc_macro;
 
diff --git a/tests/ui/feature-gates/feature-gate-derive-coerce-pointee.rs b/tests/ui/feature-gates/feature-gate-derive-coerce-pointee.rs
diff --git a/tests/ui/feature-gates/feature-gate-derive-coerce-pointee.stderr b/tests/ui/feature-gates/feature-gate-derive-coerce-pointee.stderr
diff --git a/tests/ui/self/arbitrary_self_types_dispatch_to_vtable.rs b/tests/ui/self/arbitrary_self_types_dispatch_to_vtable.rs
@@ -1,6 +1,5 @@
 //@ check-pass
 
-#![feature(derive_coerce_pointee)]
 #![feature(arbitrary_self_types)]
 
 use std::marker::CoercePointee;
diff --git a/tests/ui/self/dyn-dispatch-requires-supertrait-norm.rs b/tests/ui/self/dyn-dispatch-requires-supertrait-norm.rs
@@ -1,10 +1,9 @@
 //@ check-pass
 
-#![feature(derive_coerce_pointee)]
 #![feature(arbitrary_self_types)]
 
-use std::ops::Deref;
 use std::marker::CoercePointee;
+use std::ops::Deref;
 use std::sync::Arc;
 
 trait MyTrait<T> {}
diff --git a/tests/ui/self/dyn-dispatch-requires-supertrait.rs b/tests/ui/self/dyn-dispatch-requires-supertrait.rs
@@ -1,10 +1,9 @@
 //@ check-pass
 
-#![feature(derive_coerce_pointee)]
 #![feature(arbitrary_self_types)]
 
-use std::ops::Deref;
 use std::marker::CoercePointee;
+use std::ops::Deref;
 use std::sync::Arc;
 
 trait MyTrait {}
@@ -15,7 +14,7 @@ struct MyArc<T>
 where
     T: MyTrait + ?Sized,
 {
-    inner: Arc<T>
+    inner: Arc<T>,
 }
 
 impl<T: MyTrait + ?Sized> Deref for MyArc<T> {
