Rename #[pin_project] to #[pin_v2] to avoid naming conflicts

Author: frank-king

compiler/rustc_attr_parsing/src/attributes/mod.rs

@@ -48,7 +48,7 @@ pub(crate) mod must_use;
 pub(crate) mod no_implicit_prelude;
 pub(crate) mod non_exhaustive;
 pub(crate) mod path;
-pub(crate) mod pin_project;
+pub(crate) mod pin_v2;
 pub(crate) mod proc_macro_attrs;
 pub(crate) mod prototype;
 pub(crate) mod repr;

compiler/rustc_attr_parsing/src/attributes/pin_project.rs renamed to compiler/rustc_attr_parsing/src/attributes/pin_v2.rs

@@ -7,15 +7,15 @@ use crate::context::Stage;
 use crate::target_checking::AllowedTargets;
 use crate::target_checking::Policy::Allow;
 
-pub(crate) struct PinProjectParser;
+pub(crate) struct PinV2Parser;
 
-impl<S: Stage> NoArgsAttributeParser<S> for PinProjectParser {
-    const PATH: &[Symbol] = &[sym::pin_project];
+impl<S: Stage> NoArgsAttributeParser<S> for PinV2Parser {
+    const PATH: &[Symbol] = &[sym::pin_v2];
     const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Warn;
     const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[
         Allow(Target::Enum),
         Allow(Target::Struct),
         Allow(Target::Union),
     ]);
-    const CREATE: fn(Span) -> AttributeKind = AttributeKind::PinProject;
+    const CREATE: fn(Span) -> AttributeKind = AttributeKind::PinV2;
 }

compiler/rustc_attr_parsing/src/context.rs

@@ -47,7 +47,7 @@ use crate::attributes::must_use::MustUseParser;
 use crate::attributes::no_implicit_prelude::NoImplicitPreludeParser;
 use crate::attributes::non_exhaustive::NonExhaustiveParser;
 use crate::attributes::path::PathParser as PathAttributeParser;
-use crate::attributes::pin_project::PinProjectParser;
+use crate::attributes::pin_v2::PinV2Parser;
 use crate::attributes::proc_macro_attrs::{
     ProcMacroAttributeParser, ProcMacroDeriveParser, ProcMacroParser, RustcBuiltinMacroParser,
 };
@@ -234,7 +234,7 @@ attribute_parsers!(
         Single<WithoutArgs<NonExhaustiveParser>>,
         Single<WithoutArgs<ParenSugarParser>>,
         Single<WithoutArgs<PassByValueParser>>,
-        Single<WithoutArgs<PinProjectParser>>,
+        Single<WithoutArgs<PinV2Parser>>,
         Single<WithoutArgs<PointeeParser>>,
         Single<WithoutArgs<ProcMacroAttributeParser>>,
         Single<WithoutArgs<ProcMacroParser>>,

compiler/rustc_feature/src/builtin_attrs.rs

@@ -893,13 +893,13 @@ pub static BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
         EncodeCrossCrate::No, loop_match, experimental!(loop_match)
     ),
 
-    // The `#[pin_project]` attribute is part of the `pin_ergonomics` experiment
+    // The `#[pin_v2]` attribute is part of the `pin_ergonomics` experiment
     // that allows structurally pinning, tracked in:
     //
     // - https://github.com/rust-lang/rust/issues/130494
     gated!(
-        pin_project, Normal, template!(Word), ErrorFollowing,
-        EncodeCrossCrate::Yes, pin_ergonomics, experimental!(pin_project),
+        pin_v2, Normal, template!(Word), ErrorFollowing,
+        EncodeCrossCrate::Yes, pin_ergonomics, experimental!(pin_v2),
     ),
 
     // ==========================================================================

compiler/rustc_hir/src/attrs/data_structures.rs

@@ -637,8 +637,8 @@ pub enum AttributeKind {
     /// Represents `#[pattern_complexity_limit]`
     PatternComplexityLimit { attr_span: Span, limit_span: Span, limit: Limit },
 
-    /// Represents `#[pin_project]`
-    PinProject(Span),
+    /// Represents `#[pin_v2]`
+    PinV2(Span),
 
     /// Represents `#[pointee]`
     Pointee(Span),

compiler/rustc_hir/src/attrs/encode_cross_crate.rs

@@ -77,7 +77,7 @@ impl AttributeKind {
             PassByValue(..) => Yes,
             Path(..) => No,
             PatternComplexityLimit { .. } => No,
-            PinProject(..) => Yes,
+            PinV2(..) => Yes,
             Pointee(..) => No,
             ProcMacro(..) => No,
             ProcMacroAttribute(..) => No,

compiler/rustc_hir_typeck/messages.ftl

@@ -227,9 +227,9 @@ hir_typeck_pass_to_variadic_function = can't pass `{$ty}` to variadic function
     .suggestion = cast the value to `{$cast_ty}`
     .teach_help = certain types, like `{$ty}`, must be cast before passing them to a variadic function to match the implicit cast that a C compiler would perform as part of C's numeric promotion rules
 
-hir_typeck_project_on_non_pin_project_type = cannot project on type that is not `#[pin_project]`
+hir_typeck_project_on_non_pin_project_type = cannot project on type that is not `#[pin_v2]`
     .note = type defined here
-    .suggestion = add `#[pin_project]` here
+    .suggestion = add `#[pin_v2]` here
 
 hir_typeck_ptr_cast_add_auto_to_object = cannot add {$traits_len ->
     [1] auto trait {$traits}

compiler/rustc_hir_typeck/src/errors.rs

@@ -1164,6 +1164,6 @@ pub(crate) struct ProjectOnNonPinProjectType {
     pub span: Span,
     #[note]
     pub def_span: Option<Span>,
-    #[suggestion(code = "#[pin_project]\n", applicability = "machine-applicable")]
+    #[suggestion(code = "#[pin_v2]\n", applicability = "machine-applicable")]
     pub sugg_span: Option<Span>,
 }

compiler/rustc_hir_typeck/src/pat.rs

@@ -555,7 +555,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 debug!("scrutinee ty {expected:?} is a pinned reference, inserting pin deref");
 
                 // if the inner_ty is an ADT, make sure that it can be structurally pinned
-                // (i.e., it is `#[pin_project]`).
+                // (i.e., it is `#[pin_v2]`).
                 if let Some(adt) = inner_ty.ty_adt_def()
                     && !adt.is_pin_project()
                     && !adt.is_pin()

compiler/rustc_middle/src/ty/adt.rs

@@ -288,7 +288,7 @@ impl AdtDefData {
             debug!("found non-exhaustive variant list for {:?}", did);
             flags = flags | AdtFlags::IS_VARIANT_LIST_NON_EXHAUSTIVE;
         }
-        if find_attr!(tcx.get_all_attrs(did), AttributeKind::PinProject(..)) {
+        if find_attr!(tcx.get_all_attrs(did), AttributeKind::PinV2(..)) {
             debug!("found pin-project type {:?}", did);
             flags |= AdtFlags::IS_PIN_PROJECT;
         }
@@ -445,7 +445,7 @@ impl<'tcx> AdtDef<'tcx> {
         self.flags().contains(AdtFlags::IS_PIN)
     }
 
-    /// Returns `true` is this is `#[pin_project]` for the purposes
+    /// Returns `true` is this is `#[pin_v2]` for the purposes
     /// of structural pinning.
     #[inline]
     pub fn is_pin_project(self) -> bool {