From 73ca3ec7570d7bb9f53df6f3a9bc16b37c8f903c Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Fri, 25 Oct 2024 02:05:05 +0900 Subject: [PATCH] Tweak make_unpin_impl --- .../src/pin_project/derive.rs | 38 +++++++++---------- tests/expand/default/enum.expanded.rs | 4 +- tests/expand/default/struct.expanded.rs | 4 +- tests/expand/default/tuple_struct.expanded.rs | 4 +- tests/expand/multifields/enum.expanded.rs | 4 +- tests/expand/multifields/struct.expanded.rs | 4 +- .../multifields/tuple_struct.expanded.rs | 4 +- tests/expand/naming/enum-all.expanded.rs | 4 +- tests/expand/naming/enum-mut.expanded.rs | 4 +- tests/expand/naming/enum-none.expanded.rs | 4 +- tests/expand/naming/enum-own.expanded.rs | 4 +- tests/expand/naming/enum-ref.expanded.rs | 4 +- tests/expand/naming/struct-all.expanded.rs | 4 +- tests/expand/naming/struct-mut.expanded.rs | 4 +- tests/expand/naming/struct-none.expanded.rs | 4 +- tests/expand/naming/struct-own.expanded.rs | 4 +- tests/expand/naming/struct-ref.expanded.rs | 4 +- .../naming/tuple_struct-all.expanded.rs | 4 +- .../naming/tuple_struct-mut.expanded.rs | 4 +- .../naming/tuple_struct-none.expanded.rs | 4 +- .../naming/tuple_struct-own.expanded.rs | 4 +- .../naming/tuple_struct-ref.expanded.rs | 4 +- tests/expand/not_unpin/enum.expanded.rs | 4 +- tests/expand/not_unpin/struct.expanded.rs | 4 +- .../expand/not_unpin/tuple_struct.expanded.rs | 4 +- tests/expand/pinned_drop/enum.expanded.rs | 4 +- tests/expand/pinned_drop/struct.expanded.rs | 4 +- .../pinned_drop/tuple_struct.expanded.rs | 4 +- tests/expand/project_replace/enum.expanded.rs | 4 +- .../expand/project_replace/struct.expanded.rs | 4 +- .../project_replace/tuple_struct.expanded.rs | 4 +- tests/expand/pub/enum.expanded.rs | 4 +- tests/expand/pub/struct.expanded.rs | 4 +- tests/expand/pub/tuple_struct.expanded.rs | 4 +- tests/expand/unsafe_unpin/enum.expanded.rs | 2 +- tests/expand/unsafe_unpin/struct.expanded.rs | 2 +- .../unsafe_unpin/tuple_struct.expanded.rs | 2 +- 37 files changed, 86 insertions(+), 90 deletions(-) diff --git a/pin-project-internal/src/pin_project/derive.rs b/pin-project-internal/src/pin_project/derive.rs index c717dffa..d350fe61 100644 --- a/pin-project-internal/src/pin_project/derive.rs +++ b/pin-project-internal/src/pin_project/derive.rs @@ -693,7 +693,7 @@ fn make_unpin_impl(cx: &Context<'_>) -> TokenStream { // Make the error message highlight `UnsafeUnpin` argument. proj_generics.make_where_clause().predicates.push(parse_quote_spanned! { span => - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< _pin_project::__private::Wrapper<#lifetime, Self> >: _pin_project::UnsafeUnpin }); @@ -714,12 +714,12 @@ fn make_unpin_impl(cx: &Context<'_>) -> TokenStream { let lifetime = &cx.proj.lifetime; proj_generics.make_where_clause().predicates.push(parse_quote! { - ::pin_project::__private::PinnedFieldsOf<_pin_project::__private::Wrapper< + _pin_project::__private::PinnedFieldsOf<_pin_project::__private::Wrapper< #lifetime, _pin_project::__private::PhantomPinned >>: _pin_project::__private::Unpin }); - let (proj_impl_generics, _, proj_where_clause) = proj_generics.split_for_impl(); + let (impl_generics, _, where_clause) = proj_generics.split_for_impl(); let ty_generics = cx.orig.generics.split_for_impl().1; // For interoperability with `forbid(unsafe_code)`, `unsafe` token should be @@ -727,9 +727,8 @@ fn make_unpin_impl(cx: &Context<'_>) -> TokenStream { let unsafety = ::default(); quote_spanned! { span => #[doc(hidden)] - impl #proj_impl_generics _pin_project::__private::Unpin - for #orig_ident #ty_generics - #proj_where_clause + impl #impl_generics _pin_project::__private::Unpin for #orig_ident #ty_generics + #where_clause { } @@ -740,15 +739,14 @@ fn make_unpin_impl(cx: &Context<'_>) -> TokenStream { // impl, they'll get a "conflicting implementations of trait" error when // coherence checks are run. #[doc(hidden)] - #unsafety impl #proj_impl_generics _pin_project::UnsafeUnpin - for #orig_ident #ty_generics - #proj_where_clause + #unsafety impl #impl_generics _pin_project::UnsafeUnpin for #orig_ident #ty_generics + #where_clause { } } } UnpinImpl::Default => { - let mut full_where_clause = cx.orig.generics.where_clause.clone().unwrap(); + let mut impl_where_clause = cx.orig.generics.where_clause.clone().unwrap(); // Generate a field in our new struct for every // pinned field in the original type. @@ -791,11 +789,11 @@ fn make_unpin_impl(cx: &Context<'_>) -> TokenStream { let lifetime = &cx.proj.lifetime; let type_params = cx.orig.generics.type_params().map(|t| &t.ident); let proj_generics = &cx.proj.generics; - let (proj_impl_generics, proj_ty_generics, _) = proj_generics.split_for_impl(); - let (_, ty_generics, where_clause) = cx.orig.generics.split_for_impl(); + let (impl_generics, proj_ty_generics, _) = proj_generics.split_for_impl(); + let (_, ty_generics, ty_where_clause) = cx.orig.generics.split_for_impl(); - full_where_clause.predicates.push(parse_quote! { - ::pin_project::__private::PinnedFieldsOf<#struct_ident #proj_ty_generics>: + impl_where_clause.predicates.push(parse_quote! { + _pin_project::__private::PinnedFieldsOf<#struct_ident #proj_ty_generics>: _pin_project::__private::Unpin }); @@ -811,7 +809,7 @@ fn make_unpin_impl(cx: &Context<'_>) -> TokenStream { // However, we ensure that the user can never actually reference // this 'public' type by creating this type in the inside of `const`. #[allow(missing_debug_implementations)] - #vis struct #struct_ident #proj_generics #where_clause { + #vis struct #struct_ident #proj_generics #ty_where_clause { __pin_project_use_generics: _pin_project::__private::AlwaysUnpin< #lifetime, (#(_pin_project::__private::PhantomData<#type_params>),*) >, @@ -820,9 +818,8 @@ fn make_unpin_impl(cx: &Context<'_>) -> TokenStream { #(#lifetime_fields,)* } - impl #proj_impl_generics _pin_project::__private::Unpin - for #orig_ident #ty_generics - #full_where_clause + impl #impl_generics _pin_project::__private::Unpin for #orig_ident #ty_generics + #impl_where_clause { } @@ -833,9 +830,8 @@ fn make_unpin_impl(cx: &Context<'_>) -> TokenStream { // impl, they'll get a "conflicting implementations of trait" error when // coherence checks are run. #[doc(hidden)] - unsafe impl #proj_impl_generics _pin_project::UnsafeUnpin - for #orig_ident #ty_generics - #full_where_clause + unsafe impl #impl_generics _pin_project::UnsafeUnpin for #orig_ident #ty_generics + #impl_where_clause { } } diff --git a/tests/expand/default/enum.expanded.rs b/tests/expand/default/enum.expanded.rs index ba6bc6a7..e70cf863 100644 --- a/tests/expand/default/enum.expanded.rs +++ b/tests/expand/default/enum.expanded.rs @@ -131,14 +131,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/default/struct.expanded.rs b/tests/expand/default/struct.expanded.rs index 9cec71e6..19e0957f 100644 --- a/tests/expand/default/struct.expanded.rs +++ b/tests/expand/default/struct.expanded.rs @@ -90,14 +90,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/default/tuple_struct.expanded.rs b/tests/expand/default/tuple_struct.expanded.rs index 8bf51fe7..dfc1cb39 100644 --- a/tests/expand/default/tuple_struct.expanded.rs +++ b/tests/expand/default/tuple_struct.expanded.rs @@ -84,14 +84,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/multifields/enum.expanded.rs b/tests/expand/multifields/enum.expanded.rs index 89d0f5f4..12cf5f11 100644 --- a/tests/expand/multifields/enum.expanded.rs +++ b/tests/expand/multifields/enum.expanded.rs @@ -256,14 +256,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/multifields/struct.expanded.rs b/tests/expand/multifields/struct.expanded.rs index 247e3091..07292249 100644 --- a/tests/expand/multifields/struct.expanded.rs +++ b/tests/expand/multifields/struct.expanded.rs @@ -143,14 +143,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/multifields/tuple_struct.expanded.rs b/tests/expand/multifields/tuple_struct.expanded.rs index 57cb537c..fd410c95 100644 --- a/tests/expand/multifields/tuple_struct.expanded.rs +++ b/tests/expand/multifields/tuple_struct.expanded.rs @@ -133,14 +133,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/naming/enum-all.expanded.rs b/tests/expand/naming/enum-all.expanded.rs index a9b30c42..aa90fac8 100644 --- a/tests/expand/naming/enum-all.expanded.rs +++ b/tests/expand/naming/enum-all.expanded.rs @@ -192,14 +192,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/naming/enum-mut.expanded.rs b/tests/expand/naming/enum-mut.expanded.rs index 3996abd9..1960d51e 100644 --- a/tests/expand/naming/enum-mut.expanded.rs +++ b/tests/expand/naming/enum-mut.expanded.rs @@ -83,14 +83,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/naming/enum-none.expanded.rs b/tests/expand/naming/enum-none.expanded.rs index 13efed8d..01b716e3 100644 --- a/tests/expand/naming/enum-none.expanded.rs +++ b/tests/expand/naming/enum-none.expanded.rs @@ -38,14 +38,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/naming/enum-own.expanded.rs b/tests/expand/naming/enum-own.expanded.rs index fb37f691..5f5f7a4b 100644 --- a/tests/expand/naming/enum-own.expanded.rs +++ b/tests/expand/naming/enum-own.expanded.rs @@ -103,14 +103,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/naming/enum-ref.expanded.rs b/tests/expand/naming/enum-ref.expanded.rs index e02037f6..744a4fc3 100644 --- a/tests/expand/naming/enum-ref.expanded.rs +++ b/tests/expand/naming/enum-ref.expanded.rs @@ -84,14 +84,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/naming/struct-all.expanded.rs b/tests/expand/naming/struct-all.expanded.rs index ec3fbdc9..9f3d2455 100644 --- a/tests/expand/naming/struct-all.expanded.rs +++ b/tests/expand/naming/struct-all.expanded.rs @@ -151,14 +151,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/naming/struct-mut.expanded.rs b/tests/expand/naming/struct-mut.expanded.rs index 9c93f142..564f3eba 100644 --- a/tests/expand/naming/struct-mut.expanded.rs +++ b/tests/expand/naming/struct-mut.expanded.rs @@ -100,14 +100,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/naming/struct-none.expanded.rs b/tests/expand/naming/struct-none.expanded.rs index 9cec71e6..19e0957f 100644 --- a/tests/expand/naming/struct-none.expanded.rs +++ b/tests/expand/naming/struct-none.expanded.rs @@ -90,14 +90,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/naming/struct-own.expanded.rs b/tests/expand/naming/struct-own.expanded.rs index 9f623ca6..e1afb837 100644 --- a/tests/expand/naming/struct-own.expanded.rs +++ b/tests/expand/naming/struct-own.expanded.rs @@ -131,14 +131,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/naming/struct-ref.expanded.rs b/tests/expand/naming/struct-ref.expanded.rs index 6e9d92bc..a0db0183 100644 --- a/tests/expand/naming/struct-ref.expanded.rs +++ b/tests/expand/naming/struct-ref.expanded.rs @@ -100,14 +100,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/naming/tuple_struct-all.expanded.rs b/tests/expand/naming/tuple_struct-all.expanded.rs index c266d8f2..c94253c0 100644 --- a/tests/expand/naming/tuple_struct-all.expanded.rs +++ b/tests/expand/naming/tuple_struct-all.expanded.rs @@ -136,14 +136,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/naming/tuple_struct-mut.expanded.rs b/tests/expand/naming/tuple_struct-mut.expanded.rs index 60c99378..a3c64d48 100644 --- a/tests/expand/naming/tuple_struct-mut.expanded.rs +++ b/tests/expand/naming/tuple_struct-mut.expanded.rs @@ -91,14 +91,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/naming/tuple_struct-none.expanded.rs b/tests/expand/naming/tuple_struct-none.expanded.rs index 8bf51fe7..dfc1cb39 100644 --- a/tests/expand/naming/tuple_struct-none.expanded.rs +++ b/tests/expand/naming/tuple_struct-none.expanded.rs @@ -84,14 +84,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/naming/tuple_struct-own.expanded.rs b/tests/expand/naming/tuple_struct-own.expanded.rs index 3e4808a6..1fc58f3c 100644 --- a/tests/expand/naming/tuple_struct-own.expanded.rs +++ b/tests/expand/naming/tuple_struct-own.expanded.rs @@ -122,14 +122,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/naming/tuple_struct-ref.expanded.rs b/tests/expand/naming/tuple_struct-ref.expanded.rs index a5989b76..35d041e8 100644 --- a/tests/expand/naming/tuple_struct-ref.expanded.rs +++ b/tests/expand/naming/tuple_struct-ref.expanded.rs @@ -91,14 +91,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/not_unpin/enum.expanded.rs b/tests/expand/not_unpin/enum.expanded.rs index b1ca08ca..5c1bd2df 100644 --- a/tests/expand/not_unpin/enum.expanded.rs +++ b/tests/expand/not_unpin/enum.expanded.rs @@ -120,7 +120,7 @@ const _: () = { #[doc(hidden)] impl<'pin, T, U> _pin_project::__private::Unpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< _pin_project::__private::Wrapper< 'pin, _pin_project::__private::PhantomPinned, @@ -130,7 +130,7 @@ const _: () = { #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< _pin_project::__private::Wrapper< 'pin, _pin_project::__private::PhantomPinned, diff --git a/tests/expand/not_unpin/struct.expanded.rs b/tests/expand/not_unpin/struct.expanded.rs index 9a9343a8..5618b316 100644 --- a/tests/expand/not_unpin/struct.expanded.rs +++ b/tests/expand/not_unpin/struct.expanded.rs @@ -80,7 +80,7 @@ const _: () = { #[doc(hidden)] impl<'pin, T, U> _pin_project::__private::Unpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< _pin_project::__private::Wrapper< 'pin, _pin_project::__private::PhantomPinned, @@ -90,7 +90,7 @@ const _: () = { #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< _pin_project::__private::Wrapper< 'pin, _pin_project::__private::PhantomPinned, diff --git a/tests/expand/not_unpin/tuple_struct.expanded.rs b/tests/expand/not_unpin/tuple_struct.expanded.rs index d63586dc..abae1fee 100644 --- a/tests/expand/not_unpin/tuple_struct.expanded.rs +++ b/tests/expand/not_unpin/tuple_struct.expanded.rs @@ -74,7 +74,7 @@ const _: () = { #[doc(hidden)] impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< _pin_project::__private::Wrapper< 'pin, _pin_project::__private::PhantomPinned, @@ -84,7 +84,7 @@ const _: () = { #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< _pin_project::__private::Wrapper< 'pin, _pin_project::__private::PhantomPinned, diff --git a/tests/expand/pinned_drop/enum.expanded.rs b/tests/expand/pinned_drop/enum.expanded.rs index 1a260d40..5b3ddab4 100644 --- a/tests/expand/pinned_drop/enum.expanded.rs +++ b/tests/expand/pinned_drop/enum.expanded.rs @@ -132,14 +132,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/pinned_drop/struct.expanded.rs b/tests/expand/pinned_drop/struct.expanded.rs index 474adfa8..4f5a4120 100644 --- a/tests/expand/pinned_drop/struct.expanded.rs +++ b/tests/expand/pinned_drop/struct.expanded.rs @@ -91,14 +91,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/pinned_drop/tuple_struct.expanded.rs b/tests/expand/pinned_drop/tuple_struct.expanded.rs index 2a25ad72..55819484 100644 --- a/tests/expand/pinned_drop/tuple_struct.expanded.rs +++ b/tests/expand/pinned_drop/tuple_struct.expanded.rs @@ -85,14 +85,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/project_replace/enum.expanded.rs b/tests/expand/project_replace/enum.expanded.rs index 9393123d..c9a7d43a 100644 --- a/tests/expand/project_replace/enum.expanded.rs +++ b/tests/expand/project_replace/enum.expanded.rs @@ -103,14 +103,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/project_replace/struct.expanded.rs b/tests/expand/project_replace/struct.expanded.rs index 2312bb57..e72caebe 100644 --- a/tests/expand/project_replace/struct.expanded.rs +++ b/tests/expand/project_replace/struct.expanded.rs @@ -121,14 +121,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/project_replace/tuple_struct.expanded.rs b/tests/expand/project_replace/tuple_struct.expanded.rs index b367bcf4..ba1e192b 100644 --- a/tests/expand/project_replace/tuple_struct.expanded.rs +++ b/tests/expand/project_replace/tuple_struct.expanded.rs @@ -115,14 +115,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/pub/enum.expanded.rs b/tests/expand/pub/enum.expanded.rs index aed6ffcb..c80179c8 100644 --- a/tests/expand/pub/enum.expanded.rs +++ b/tests/expand/pub/enum.expanded.rs @@ -131,14 +131,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Enum<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/pub/struct.expanded.rs b/tests/expand/pub/struct.expanded.rs index d84cf00f..8c614277 100644 --- a/tests/expand/pub/struct.expanded.rs +++ b/tests/expand/pub/struct.expanded.rs @@ -90,14 +90,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __Struct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/pub/tuple_struct.expanded.rs b/tests/expand/pub/tuple_struct.expanded.rs index 4acdf70b..f7639bdc 100644 --- a/tests/expand/pub/tuple_struct.expanded.rs +++ b/tests/expand/pub/tuple_struct.expanded.rs @@ -84,14 +84,14 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} #[doc(hidden)] unsafe impl<'pin, T, U> _pin_project::UnsafeUnpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< __TupleStruct<'pin, T, U>, >: _pin_project::__private::Unpin, {} diff --git a/tests/expand/unsafe_unpin/enum.expanded.rs b/tests/expand/unsafe_unpin/enum.expanded.rs index 19f10ade..4831eae3 100644 --- a/tests/expand/unsafe_unpin/enum.expanded.rs +++ b/tests/expand/unsafe_unpin/enum.expanded.rs @@ -119,7 +119,7 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Enum where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< _pin_project::__private::Wrapper<'pin, Self>, >: _pin_project::UnsafeUnpin, {} diff --git a/tests/expand/unsafe_unpin/struct.expanded.rs b/tests/expand/unsafe_unpin/struct.expanded.rs index 496c2f54..08d226fa 100644 --- a/tests/expand/unsafe_unpin/struct.expanded.rs +++ b/tests/expand/unsafe_unpin/struct.expanded.rs @@ -79,7 +79,7 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for Struct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< _pin_project::__private::Wrapper<'pin, Self>, >: _pin_project::UnsafeUnpin, {} diff --git a/tests/expand/unsafe_unpin/tuple_struct.expanded.rs b/tests/expand/unsafe_unpin/tuple_struct.expanded.rs index 8a2a9111..bc151dd7 100644 --- a/tests/expand/unsafe_unpin/tuple_struct.expanded.rs +++ b/tests/expand/unsafe_unpin/tuple_struct.expanded.rs @@ -73,7 +73,7 @@ const _: () = { } impl<'pin, T, U> _pin_project::__private::Unpin for TupleStruct where - ::pin_project::__private::PinnedFieldsOf< + _pin_project::__private::PinnedFieldsOf< _pin_project::__private::Wrapper<'pin, Self>, >: _pin_project::UnsafeUnpin, {}