s/SmartPointer/CoerceReferent/g

move derive_smart_pointer into removed set

Author: dingxiangfei2009

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`

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;

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,
 }

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);

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)]`")),

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(...))]`.

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

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,

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 */
 }