Merge pull request #1510 from dtolnay/borrowasptr

Resolve borrow_as_ptr clippy lints in generated code

Author: dtolnay

macro/src/expand.rs

@@ -1463,6 +1463,11 @@ fn expand_unique_ptr(
 
     let can_construct_from_value = types.is_maybe_trivial(ident);
     let new_method = if can_construct_from_value {
+        let raw_mut = if rustversion::cfg!(since(1.82)) {
+            quote!(&raw mut)
+        } else {
+            quote!(&mut)
+        };
         Some(quote! {
             fn __new(value: Self) -> ::cxx::core::mem::MaybeUninit<*mut ::cxx::core::ffi::c_void> {
                 #UnsafeExtern extern "C" {
@@ -1471,7 +1476,7 @@ fn expand_unique_ptr(
                 }
                 let mut repr = ::cxx::core::mem::MaybeUninit::uninit();
                 unsafe {
-                    __uninit(&mut repr).cast::<#ident #ty_generics>().write(value);
+                    __uninit(#raw_mut repr).cast::<#ident #ty_generics>().write(value);
                 }
                 repr
             }
@@ -1483,6 +1488,16 @@ fn expand_unique_ptr(
     let begin_span = explicit_impl.map_or(key.begin_span, |explicit| explicit.impl_token.span);
     let end_span = explicit_impl.map_or(key.end_span, |explicit| explicit.brace_token.span.join());
     let unsafe_token = format_ident!("unsafe", span = begin_span);
+    let raw_const = if rustversion::cfg!(since(1.82)) {
+        quote_spanned!(end_span=> &raw const)
+    } else {
+        quote_spanned!(end_span=> &)
+    };
+    let raw_mut = if rustversion::cfg!(since(1.82)) {
+        quote_spanned!(end_span=> &raw mut)
+    } else {
+        quote_spanned!(end_span=> &mut)
+    };
 
     quote_spanned! {end_span=>
         #[automatically_derived]
@@ -1497,7 +1512,7 @@ fn expand_unique_ptr(
                 }
                 let mut repr = ::cxx::core::mem::MaybeUninit::uninit();
                 unsafe {
-                    __null(&mut repr);
+                    __null(#raw_mut repr);
                 }
                 repr
             }
@@ -1509,7 +1524,7 @@ fn expand_unique_ptr(
                 }
                 let mut repr = ::cxx::core::mem::MaybeUninit::uninit();
                 unsafe {
-                    __raw(&mut repr, raw.cast());
+                    __raw(#raw_mut repr, raw.cast());
                 }
                 repr
             }
@@ -1518,22 +1533,22 @@ fn expand_unique_ptr(
                     #[link_name = #link_get]
                     fn __get(this: *const ::cxx::core::mem::MaybeUninit<*mut ::cxx::core::ffi::c_void>) -> *const ::cxx::core::ffi::c_void;
                 }
-                unsafe { __get(&repr).cast() }
+                unsafe { __get(#raw_const repr).cast() }
             }
             unsafe fn __release(mut repr: ::cxx::core::mem::MaybeUninit<*mut ::cxx::core::ffi::c_void>) -> *mut Self {
                 #UnsafeExtern extern "C" {
                     #[link_name = #link_release]
                     fn __release(this: *mut ::cxx::core::mem::MaybeUninit<*mut ::cxx::core::ffi::c_void>) -> *mut ::cxx::core::ffi::c_void;
                 }
-                unsafe { __release(&mut repr).cast() }
+                unsafe { __release(#raw_mut repr).cast() }
             }
             unsafe fn __drop(mut repr: ::cxx::core::mem::MaybeUninit<*mut ::cxx::core::ffi::c_void>) {
                 #UnsafeExtern extern "C" {
                     #[link_name = #link_drop]
                     fn __drop(this: *mut ::cxx::core::mem::MaybeUninit<*mut ::cxx::core::ffi::c_void>);
                 }
                 unsafe {
-                    __drop(&mut repr);
+                    __drop(#raw_mut repr);
                 }
             }
         }
@@ -1769,6 +1784,17 @@ fn expand_cxx_vector(
         None
     };
 
+    let raw_const = if rustversion::cfg!(since(1.82)) {
+        quote_spanned!(end_span=> &raw const)
+    } else {
+        quote_spanned!(end_span=> &)
+    };
+    let raw_mut = if rustversion::cfg!(since(1.82)) {
+        quote_spanned!(end_span=> &raw mut)
+    } else {
+        quote_spanned!(end_span=> &mut)
+    };
+
     quote_spanned! {end_span=>
         #[automatically_derived]
         #unsafe_token impl #impl_generics ::cxx::private::VectorElement for #elem #ty_generics {
@@ -1807,7 +1833,7 @@ fn expand_cxx_vector(
                 }
                 let mut repr = ::cxx::core::mem::MaybeUninit::uninit();
                 unsafe {
-                    __unique_ptr_null(&mut repr);
+                    __unique_ptr_null(#raw_mut repr);
                 }
                 repr
             }
@@ -1818,7 +1844,7 @@ fn expand_cxx_vector(
                 }
                 let mut repr = ::cxx::core::mem::MaybeUninit::uninit();
                 unsafe {
-                    __unique_ptr_raw(&mut repr, raw);
+                    __unique_ptr_raw(#raw_mut repr, raw);
                 }
                 repr
             }
@@ -1827,22 +1853,22 @@ fn expand_cxx_vector(
                     #[link_name = #link_unique_ptr_get]
                     fn __unique_ptr_get #impl_generics(this: *const ::cxx::core::mem::MaybeUninit<*mut ::cxx::core::ffi::c_void>) -> *const ::cxx::CxxVector<#elem #ty_generics>;
                 }
-                unsafe { __unique_ptr_get(&repr) }
+                unsafe { __unique_ptr_get(#raw_const repr) }
             }
             unsafe fn __unique_ptr_release(mut repr: ::cxx::core::mem::MaybeUninit<*mut ::cxx::core::ffi::c_void>) -> *mut ::cxx::CxxVector<Self> {
                 #UnsafeExtern extern "C" {
                     #[link_name = #link_unique_ptr_release]
                     fn __unique_ptr_release #impl_generics(this: *mut ::cxx::core::mem::MaybeUninit<*mut ::cxx::core::ffi::c_void>) -> *mut ::cxx::CxxVector<#elem #ty_generics>;
                 }
-                unsafe { __unique_ptr_release(&mut repr) }
+                unsafe { __unique_ptr_release(#raw_mut repr) }
             }
             unsafe fn __unique_ptr_drop(mut repr: ::cxx::core::mem::MaybeUninit<*mut ::cxx::core::ffi::c_void>) {
                 #UnsafeExtern extern "C" {
                     #[link_name = #link_unique_ptr_drop]
                     fn __unique_ptr_drop(this: *mut ::cxx::core::mem::MaybeUninit<*mut ::cxx::core::ffi::c_void>);
                 }
                 unsafe {
-                    __unique_ptr_drop(&mut repr);
+                    __unique_ptr_drop(#raw_mut repr);
                 }
             }
         }