s/SmartPointer/CoerceReferent/g

move derive_smart_pointer into removed set

Author: dingxiangfei2009

Diff for: compiler/rustc_builtin_macros/messages.ftl

@@ -235,7 +235,7 @@ builtin_macros_non_exhaustive_default = default variant must be exhaustive
     .label = declared `#[non_exhaustive]` here
     .help = consider a manual implementation of `Default`
 
-builtin_macros_non_generic_pointee = the `#[pointee]` attribute may only be used on generic parameters
+builtin_macros_non_generic_referent = the `#[referent]` attribute may only be used on generic parameters
 
 builtin_macros_non_unit_default = the `#[default]` attribute may only be used on unit enum variants
     .help = consider a manual implementation of `Default`

Diff for: compiler/rustc_builtin_macros/src/deriving/smart_ptr.rs renamed to compiler/rustc_builtin_macros/src/deriving/coerce_referent.rs

@@ -22,12 +22,12 @@ macro path_std($($x:tt)*) {
 
 pub(crate) mod bounds;
 pub(crate) mod clone;
+pub(crate) mod coerce_referent;
 pub(crate) mod debug;
 pub(crate) mod decodable;
 pub(crate) mod default;
 pub(crate) mod encodable;
 pub(crate) mod hash;
-pub(crate) mod smart_ptr;
 
 #[path = "cmp/eq.rs"]
 pub(crate) mod eq;

Diff for: compiler/rustc_builtin_macros/src/deriving/mod.rs

@@ -942,8 +942,8 @@ pub(crate) struct NakedFunctionTestingAttribute {
 }
 
 #[derive(Diagnostic)]
-#[diag(builtin_macros_non_generic_pointee)]
-pub(crate) struct NonGenericPointee {
+#[diag(builtin_macros_non_generic_referent)]
+pub(crate) struct NonGenericReferent {
     #[primary_span]
     pub span: Span,
 }

Diff for: compiler/rustc_builtin_macros/src/errors.rs

@@ -130,7 +130,7 @@ pub fn register_builtin_macros(resolver: &mut dyn ResolverExpand) {
         PartialOrd: partial_ord::expand_deriving_partial_ord,
         RustcDecodable: decodable::expand_deriving_rustc_decodable,
         RustcEncodable: encodable::expand_deriving_rustc_encodable,
-        SmartPointer: smart_ptr::expand_deriving_smart_ptr,
+        CoerceReferent: coerce_referent::expand_deriving_coerce_referent,
     }
 
     let client = proc_macro::bridge::client::Client::expand1(proc_macro::quote);

Diff for: compiler/rustc_builtin_macros/src/lib.rs

@@ -85,6 +85,8 @@ declare_features! (
     /// Allows default type parameters to influence type inference.
     (removed, default_type_parameter_fallback, "1.82.0", Some(27336),
      Some("never properly implemented; requires significant design work")),
+    /// Allows deriving traits as per `SmartPointer` specification
+    (removed, derive_smart_pointer, "1.79.0", Some(123430), Some("replaced by `CoerceReferent`")),
     /// Allows using `#[doc(keyword = "...")]`.
     (removed, doc_keyword, "1.28.0", Some(51315),
      Some("merged into `#![feature(rustdoc_internals)]`")),

Diff for: compiler/rustc_feature/src/removed.rs

@@ -432,8 +432,8 @@ declare_features! (
     (unstable, deprecated_suggestion, "1.61.0", Some(94785)),
     /// Allows deref patterns.
     (incomplete, deref_patterns, "1.79.0", Some(87121)),
-    /// Allows deriving `SmartPointer` traits
-    (unstable, derive_smart_pointer, "1.79.0", Some(123430)),
+    /// Allows deriving traits as per `CoerceReferent` specification
+    (unstable, derive_coerce_referent, "1.79.0", Some(123430)),
     /// Controls errors in trait implementations.
     (unstable, do_not_recommend, "1.67.0", Some(51992)),
     /// Tells rustdoc to automatically generate `#[doc(cfg(...))]`.

Diff for: compiler/rustc_feature/src/unstable.rs

@@ -259,7 +259,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
                     | sym::cfg_attr
                     // need to be fixed
                     | sym::cfi_encoding // FIXME(cfi_encoding)
-                    | sym::pointee // FIXME(derive_smart_pointer)
+                    | sym::referent // FIXME(derive_coerce_referent)
                     | sym::omit_gdb_pretty_printer_section // FIXME(omit_gdb_pretty_printer_section)
                     | sym::used // handled elsewhere to restrict to static items
                     | sym::repr // handled elsewhere to restrict to type decls items

Diff for: compiler/rustc_passes/src/check_attr.rs

@@ -174,6 +174,7 @@ symbols! {
         Center,
         Cleanup,
         Clone,
+        CoerceReferent,
         CoerceUnsized,
         Command,
         ConstParamTy,
@@ -315,7 +316,6 @@ symbols! {
         Sized,
         SliceIndex,
         SliceIter,
-        SmartPointer,
         Some,
         SpanCtxt,
         String,
@@ -737,6 +737,7 @@ symbols! {
         deref_pure,
         deref_target,
         derive,
+        derive_coerce_referent,
         derive_const,
         derive_default_enum,
         derive_smart_pointer,
@@ -1460,7 +1461,6 @@ symbols! {
         plugin,
         plugin_registrar,
         plugins,
-        pointee,
         pointee_trait,
         pointer,
         pointer_like,
@@ -1571,6 +1571,7 @@ symbols! {
         ref_pat_everywhere,
         ref_unwind_safe_trait,
         reference,
+        referent,
         reflect,
         reg,
         reg16,

Diff for: compiler/rustc_span/src/symbol.rs

@@ -1062,10 +1062,11 @@ pub trait FnPtr: Copy + Clone {
 }
 
 /// Derive macro generating impls of traits related to smart pointers.
-#[rustc_builtin_macro(SmartPointer, attributes(pointee))]
+#[rustc_builtin_macro(CoerceReferent, attributes(referent))]
 #[allow_internal_unstable(dispatch_from_dyn, coerce_unsized, unsize)]
-#[unstable(feature = "derive_smart_pointer", issue = "123430")]
-pub macro SmartPointer($item:item) {
+#[unstable(feature = "derive_coerce_referent", issue = "123430")]
+#[cfg(not(bootstrap))]
+pub macro CoerceReferent($item:item) {
     /* compiler built-in */
 }
 

Diff for: library/core/src/marker.rs

@@ -6,9 +6,9 @@
 
 extern crate proc_macro;
 
-use proc_macro::{quote, TokenStream};
+use proc_macro::{TokenStream, quote};
 
-#[proc_macro_derive(AnotherMacro, attributes(pointee))]
+#[proc_macro_derive(AnotherMacro, attributes(referent))]
 pub fn derive(_input: TokenStream) -> TokenStream {
     quote! {
         const _: () = {
@@ -19,13 +19,13 @@ pub fn derive(_input: TokenStream) -> TokenStream {
 }
 
 #[proc_macro_attribute]
-pub fn pointee(
+pub fn referent(
     _attr: proc_macro::TokenStream,
     _item: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
     quote! {
         const _: () = {
-            const POINTEE_MACRO_ATTR_DERIVED: () = ();
+            const REFERENT_MACRO_ATTR_DERIVED: () = ();
         };
     }
     .into()

Diff for: tests/ui/deriving/auxiliary/another-proc-macro.rs

@@ -2,24 +2,24 @@
 //@ aux-build: another-proc-macro.rs
 //@ compile-flags: -Zunpretty=expanded
 
-#![feature(derive_smart_pointer)]
+#![feature(derive_coerce_referent)]
 
 #[macro_use]
 extern crate another_proc_macro;
 
-use another_proc_macro::{pointee, AnotherMacro};
+use another_proc_macro::{AnotherMacro, referent};
 
-#[derive(core::marker::SmartPointer)]
+#[derive(core::marker::CoerceReferent)]
 #[repr(transparent)]
-pub struct Ptr<'a, #[pointee] T: ?Sized> {
+pub struct Ptr<'a, #[referent] T: ?Sized> {
     data: &'a mut T,
 }
 
-#[pointee]
+#[referent]
 fn f() {}
 
 #[derive(AnotherMacro)]
-#[pointee]
+#[referent]
 struct MyStruct;
 
 fn main() {}

Diff for: tests/ui/deriving/built-in-proc-macro-scope.rs

@@ -4,7 +4,7 @@
 //@ aux-build: another-proc-macro.rs
 //@ compile-flags: -Zunpretty=expanded
 
-#![feature(derive_smart_pointer)]
+#![feature(derive_coerce_referent)]
 #[prelude_import]
 use ::std::prelude::rust_2015::*;
 #[macro_use]
@@ -13,10 +13,10 @@ extern crate std;
 #[macro_use]
 extern crate another_proc_macro;
 
-use another_proc_macro::{pointee, AnotherMacro};
+use another_proc_macro::{AnotherMacro, referent};
 
 #[repr(transparent)]
-pub struct Ptr<'a, #[pointee] T: ?Sized> {
+pub struct Ptr<'a, #[referent] T: ?Sized> {
     data: &'a mut T,
 }
 #[automatically_derived]
@@ -32,9 +32,9 @@ impl<'a, T: ?Sized + ::core::marker::Unsize<__S>, __S: ?Sized>
 
 const _: () =
     {
-        const POINTEE_MACRO_ATTR_DERIVED: () = ();
+        const REFERENT_MACRO_ATTR_DERIVED: () = ();
     };
-#[pointee]
+#[referent]
 struct MyStruct;
 const _: () =
     {

Diff for: tests/ui/deriving/built-in-proc-macro-scope.stdout

@@ -1,10 +1,10 @@
 //@ check-pass
 
-#![feature(derive_smart_pointer)]
+#![feature(derive_coerce_referent)]
 
-#[derive(core::marker::SmartPointer)]
+#[derive(core::marker::CoerceReferent)]
 #[repr(transparent)]
-pub struct Ptr<'a, #[pointee] T: OnDrop + ?Sized, X> {
+pub struct Ptr<'a, #[referent] T: OnDrop + ?Sized, X> {
     data: &'a mut T,
     x: core::marker::PhantomData<X>,
 }
@@ -13,9 +13,9 @@ pub trait OnDrop {
     fn on_drop(&mut self);
 }
 
-#[derive(core::marker::SmartPointer)]
+#[derive(core::marker::CoerceReferent)]
 #[repr(transparent)]
-pub struct Ptr2<'a, #[pointee] T: ?Sized, X>
+pub struct Ptr2<'a, #[referent] T: ?Sized, X>
 where
     T: OnDrop,
 {
@@ -25,26 +25,26 @@ where
 
 pub trait MyTrait<T: ?Sized> {}
 
-#[derive(core::marker::SmartPointer)]
+#[derive(core::marker::CoerceReferent)]
 #[repr(transparent)]
-pub struct Ptr3<'a, #[pointee] T: ?Sized, X>
+pub struct Ptr3<'a, #[referent] T: ?Sized, X>
 where
     T: MyTrait<T>,
 {
     data: &'a mut T,
     x: core::marker::PhantomData<X>,
 }
 
-#[derive(core::marker::SmartPointer)]
+#[derive(core::marker::CoerceReferent)]
 #[repr(transparent)]
-pub struct Ptr4<'a, #[pointee] T: MyTrait<T> + ?Sized, X> {
+pub struct Ptr4<'a, #[referent] T: MyTrait<T> + ?Sized, X> {
     data: &'a mut T,
     x: core::marker::PhantomData<X>,
 }
 
-#[derive(core::marker::SmartPointer)]
+#[derive(core::marker::CoerceReferent)]
 #[repr(transparent)]
-pub struct Ptr5<'a, #[pointee] T: ?Sized, X>
+pub struct Ptr5<'a, #[referent] T: ?Sized, X>
 where
     Ptr5Companion<T>: MyTrait<T>,
     Ptr5Companion2: MyTrait<T>,
@@ -56,17 +56,17 @@ where
 pub struct Ptr5Companion<T: ?Sized>(core::marker::PhantomData<T>);
 pub struct Ptr5Companion2;
 
-#[derive(core::marker::SmartPointer)]
+#[derive(core::marker::CoerceReferent)]
 #[repr(transparent)]
-pub struct Ptr6<'a, #[pointee] T: ?Sized, X: MyTrait<T> = (), const PARAM: usize = 0> {
+pub struct Ptr6<'a, #[referent] T: ?Sized, X: MyTrait<T> = (), const PARAM: usize = 0> {
     data: &'a mut T,
     x: core::marker::PhantomData<X>,
 }
 
 // a reduced example from https://lore.kernel.org/all/[email protected]/
 #[repr(transparent)]
-#[derive(core::marker::SmartPointer)]
-pub struct ListArc<#[pointee] T, const ID: u64 = 0>
+#[derive(core::marker::CoerceReferent)]
+pub struct ListArc<#[referent] T, const ID: u64 = 0>
 where
     T: ListArcSafe<ID> + ?Sized,
 {

Diff for: tests/ui/deriving/smart-pointer-bounds-issue-127647.rs renamed to tests/ui/deriving/coerce-referent-bounds-issue-127647.rs

@@ -1,27 +1,27 @@
 //@ check-pass
 //@ compile-flags: -Zunpretty=expanded
-#![feature(derive_smart_pointer)]
-use std::marker::SmartPointer;
+#![feature(derive_coerce_referent)]
+use std::marker::CoerceReferent;
 
 pub trait MyTrait<T: ?Sized> {}
 
-#[derive(SmartPointer)]
+#[derive(CoerceReferent)]
 #[repr(transparent)]
-struct MyPointer<'a, #[pointee] T: ?Sized> {
+struct MyPointer<'a, #[referent] T: ?Sized> {
     ptr: &'a T,
 }
 
-#[derive(core::marker::SmartPointer)]
+#[derive(core::marker::CoerceReferent)]
 #[repr(transparent)]
-pub struct MyPointer2<'a, Y, Z: MyTrait<T>, #[pointee] T: ?Sized + MyTrait<T>, X: MyTrait<T> = ()>
+pub struct MyPointer2<'a, Y, Z: MyTrait<T>, #[referent] T: ?Sized + MyTrait<T>, X: MyTrait<T> = ()>
 where
     Y: MyTrait<T>,
 {
     data: &'a mut T,
     x: core::marker::PhantomData<X>,
 }
 
-#[derive(SmartPointer)]
+#[derive(CoerceReferent)]
 #[repr(transparent)]
 struct MyPointerWithoutPointee<'a, T: ?Sized> {
     ptr: &'a T,

Diff for: tests/ui/deriving/deriving-smart-pointer-expanded.rs renamed to tests/ui/deriving/deriving-coerce-referent-expanded.rs

@@ -2,17 +2,17 @@
 #![no_std]
 //@ check-pass
 //@ compile-flags: -Zunpretty=expanded
-#![feature(derive_smart_pointer)]
+#![feature(derive_coerce_referent)]
 #[prelude_import]
 use ::std::prelude::rust_2015::*;
 #[macro_use]
 extern crate std;
-use std::marker::SmartPointer;
+use std::marker::CoerceReferent;
 
 pub trait MyTrait<T: ?Sized> {}
 
 #[repr(transparent)]
-struct MyPointer<'a, #[pointee] T: ?Sized> {
+struct MyPointer<'a, #[referent] T: ?Sized> {
     ptr: &'a T,
 }
 #[automatically_derived]
@@ -25,8 +25,8 @@ impl<'a, T: ?Sized + ::core::marker::Unsize<__S>, __S: ?Sized>
 }
 
 #[repr(transparent)]
-pub struct MyPointer2<'a, Y, Z: MyTrait<T>, #[pointee] T: ?Sized + MyTrait<T>,
-    X: MyTrait<T> = ()> where Y: MyTrait<T> {
+pub struct MyPointer2<'a, Y, Z: MyTrait<T>, #[referent] T: ?Sized +
+    MyTrait<T>, X: MyTrait<T> = ()> where Y: MyTrait<T> {
     data: &'a mut T,
     x: core::marker::PhantomData<X>,
 }