fix ci on beta rust

Author: usamoi

cargo-pgrx/src/command/info.rs

@@ -78,7 +78,7 @@ impl CommandExecute for Info {
     }
 }
 
-fn version(ver: &str) -> Cow<str> {
+fn version(ver: &str) -> Cow<'_, str> {
     if ver.starts_with("pg") {
         Cow::Borrowed(ver)
     } else {

cargo-pgrx/src/command/schema.rs

@@ -594,7 +594,7 @@ fn compute_sql(package_name: &str, manifest: &Manifest) -> eyre::Result<()> {
     Ok(())
 }
 
-fn parse_object(data: &[u8]) -> object::Result<object::File> {
+fn parse_object(data: &[u8]) -> object::Result<'_, object::File> {
     let kind = object::FileKind::parse(data)?;
 
     match kind {

pgrx-macros/src/lib.rs

@@ -967,7 +967,7 @@ fn impl_postgres_type(ast: DeriveInput) -> syn::Result<proc_macro2::TokenStream>
             #[::pgrx::pgrx_macros::pg_extern(immutable,parallel_safe)]
             pub fn #funcname_in #generics(input: Option<&::core::ffi::CStr>) -> Option<#name #generics> {
                 input.map_or_else(|| {
-                    for m in <#name as ::pgrx::inoutfuncs::InOutFuncs>::NULL_ERROR_MESSAGE {
+                    if let Some(m) = <#name as ::pgrx::inoutfuncs::InOutFuncs>::NULL_ERROR_MESSAGE {
                         ::pgrx::pg_sys::error!("{m}");
                     }
                     None
@@ -990,7 +990,7 @@ fn impl_postgres_type(ast: DeriveInput) -> syn::Result<proc_macro2::TokenStream>
             #[::pgrx::pgrx_macros::pg_extern(immutable,parallel_safe)]
             pub fn #funcname_in #generics(input: Option<&::core::ffi::CStr>) -> Option<::pgrx::datum::PgVarlena<#name #generics>> {
                 input.map_or_else(|| {
-                    for m in <#name as ::pgrx::inoutfuncs::PgVarlenaInOutFuncs>::NULL_ERROR_MESSAGE {
+                    if let Some(m) = <#name as ::pgrx::inoutfuncs::PgVarlenaInOutFuncs>::NULL_ERROR_MESSAGE {
                         ::pgrx::pg_sys::error!("{m}");
                     }
                     None

pgrx-pg-sys/src/include.rs

@@ -5,6 +5,7 @@
 #[cfg(all(feature = "pg13", not(docsrs)))]
 pub(crate) mod pg13 {
     #![allow(clippy::all)]
+    #![allow(unnecessary_transmutes)]
     include!(concat!(env!("OUT_DIR"), "/pg13.rs"));
 }
 #[cfg(all(feature = "pg13", docsrs))]
@@ -13,6 +14,7 @@ pub(crate) mod pg13;
 #[cfg(all(feature = "pg14", not(docsrs)))]
 pub(crate) mod pg14 {
     #![allow(clippy::all)]
+    #![allow(unnecessary_transmutes)]
     include!(concat!(env!("OUT_DIR"), "/pg14.rs"));
 }
 #[cfg(all(feature = "pg14", docsrs))]
@@ -21,6 +23,7 @@ pub(crate) mod pg14;
 #[cfg(all(feature = "pg15", not(docsrs)))]
 pub(crate) mod pg15 {
     #![allow(clippy::all)]
+    #![allow(unnecessary_transmutes)]
     include!(concat!(env!("OUT_DIR"), "/pg15.rs"));
 }
 #[cfg(all(feature = "pg15", docsrs))]
@@ -29,6 +32,7 @@ pub(crate) mod pg15;
 #[cfg(all(feature = "pg16", not(docsrs)))]
 pub(crate) mod pg16 {
     #![allow(clippy::all)]
+    #![allow(unnecessary_transmutes)]
     include!(concat!(env!("OUT_DIR"), "/pg16.rs"));
 }
 #[cfg(all(feature = "pg16", docsrs))]
@@ -37,6 +41,7 @@ pub(crate) mod pg16;
 #[cfg(all(feature = "pg17", not(docsrs)))]
 pub(crate) mod pg17 {
     #![allow(clippy::all)]
+    #![allow(unnecessary_transmutes)]
     include!(concat!(env!("OUT_DIR"), "/pg17.rs"));
 }
 #[cfg(all(feature = "pg17", docsrs))]
@@ -45,6 +50,7 @@ pub(crate) mod pg17;
 #[cfg(all(feature = "pg18", not(docsrs)))]
 pub(crate) mod pg18 {
     #![allow(clippy::all)]
+    #![allow(unnecessary_transmutes)]
     include!(concat!(env!("OUT_DIR"), "/pg18.rs"));
 }
 #[cfg(all(feature = "pg18", docsrs))]

pgrx-tests/src/tests/trigger_tests.rs

@@ -74,7 +74,7 @@ mod tests {
         }
 
         #[pg_trigger]
-        fn signature_aliased_both(_trigger: AliasedBorrowedPgTrigger) -> AliasedTriggerResult<'_> {
+        fn signature_aliased_both(_trigger: AliasedBorrowedPgTrigger<'_>) -> AliasedTriggerResult<'_> {
             unimplemented!("Only testing signature compiles")
         }
     }

pgrx-tests/tests/compile-fail/table-iterators-arent-immortal.rs

@@ -3,7 +3,7 @@ use pgrx::prelude::*;
 #[pg_extern]
 fn returns_tuple_with_lifetime(
     value: &'static str,
-) -> TableIterator<(name!(a, &'static str), name!(b, Option<&'static str>))> {
+) -> TableIterator<'static, (name!(a, &'static str), name!(b, Option<&'static str>))> {
     TableIterator::once((value, Some(value)))
 }
 

pgrx-tests/tests/compile-fail/table-iterators-arent-immortal.stderr

@@ -1,26 +1,14 @@
-warning: elided lifetime has a name
- --> tests/compile-fail/table-iterators-arent-immortal.rs:6:19
-  |
-6 | ) -> TableIterator<(name!(a, &'static str), name!(b, Option<&'static str>))> {
-  |                   ^ this elided lifetime gets resolved as `'static`
-  |
-  = note: `#[warn(elided_named_lifetimes)]` on by default
-help: consider specifying it explicitly
-  |
-6 | ) -> TableIterator<'static, (name!(a, &'static str), name!(b, Option<&'static str>))> {
-  |                    ++++++++
-
 error[E0521]: borrowed data escapes outside of function
- --> tests/compile-fail/table-iterators-arent-immortal.rs:6:78
+ --> tests/compile-fail/table-iterators-arent-immortal.rs:6:87
   |
 3 |   #[pg_extern]
   |   ------------
   |   |
   |   lifetime `'fcx` defined here
   |   in this procedural macro expansion
 ...
-6 |   ) -> TableIterator<(name!(a, &'static str), name!(b, Option<&'static str>))> {
-  |  ______________________________________________________________________________^
+6 |   ) -> TableIterator<'static, (name!(a, &'static str), name!(b, Option<&'static str>))> {
+  |  _______________________________________________________________________________________^
 7 | |     TableIterator::once((value, Some(value)))
 8 | | }
   | | ^

pgrx/src/datum/into.rs

@@ -378,7 +378,7 @@ impl<'a> IntoDatum for &'a [u8] {
             // and the `dest` was freshly allocated, thus non-overlapping
             std::ptr::copy_nonoverlapping(
                 self.as_ptr(),
-                addr_of_mut!((*varattrib_4b).va_data).cast::<u8>(),
+                addr_of_mut!((&mut *varattrib_4b).va_data).cast::<u8>(),
                 self.len(),
             );
 

pgrx/src/fn_call.rs

@@ -410,7 +410,7 @@ fn lookup_fn(fname: &str, args: &[&dyn FnCallArg]) -> Result<pg_sys::Oid> {
 
 /// Parses an arbitrary string as if it is a SQL identifier.  If it's not, [`FnCallError::InvalidIdentifier`]
 /// is returned
-fn parse_sql_ident(ident: &str) -> Result<Array<&str>> {
+fn parse_sql_ident(ident: &str) -> Result<Array<'_, &str>> {
     unsafe {
         direct_function_call::<Array<&str>>(
             pg_sys::parse_ident,

pgrx/src/lwlock.rs

@@ -51,7 +51,7 @@ impl<T> PgLwLock<T> {
     }
 
     /// Obtain a shared lock (which comes with `&T` access)
-    pub fn share(&self) -> PgLwLockShareGuard<T> {
+    pub fn share(&self) -> PgLwLockShareGuard<'_, T> {
         unsafe {
             let shared = self.inner.get().read().as_ref().expect("PgLwLock was not initialized");
             pg_sys::LWLockAcquire((*shared).lock_ptr, pg_sys::LWLockMode::LW_SHARED);
@@ -60,7 +60,7 @@ impl<T> PgLwLock<T> {
     }
 
     /// Obtain an exclusive lock (which comes with `&mut T` access)
-    pub fn exclusive(&self) -> PgLwLockExclusiveGuard<T> {
+    pub fn exclusive(&self) -> PgLwLockExclusiveGuard<'_, T> {
         unsafe {
             let shared = self.inner.get().read().as_ref().expect("PgLwLock was not initialized");
             pg_sys::LWLockAcquire((*shared).lock_ptr, pg_sys::LWLockMode::LW_EXCLUSIVE);