diff --git a/arrow-flight/src/arrow.flight.protocol.rs b/arrow-flight/src/arrow.flight.protocol.rs index 79c6a944fd67..b1a79ee72031 100644 --- a/arrow-flight/src/arrow.flight.protocol.rs +++ b/arrow-flight/src/arrow.flight.protocol.rs @@ -242,7 +242,7 @@ pub mod flight_service_client { interceptor: F, ) -> FlightServiceClient> where - F: FnMut(tonic::Request<()>) -> Result, tonic::Status>, + F: tonic::service::Interceptor, T: tonic::codegen::Service< http::Request, Response = http::Response< @@ -666,7 +666,7 @@ pub mod flight_service_server { interceptor: F, ) -> InterceptedService where - F: FnMut(tonic::Request<()>) -> Result, tonic::Status>, + F: tonic::service::Interceptor, { InterceptedService::new(Self::new(inner), interceptor) } diff --git a/arrow/src/alloc/types.rs b/arrow/src/alloc/types.rs index c1f0ef995806..92a6107f3d54 100644 --- a/arrow/src/alloc/types.rs +++ b/arrow/src/alloc/types.rs @@ -36,7 +36,7 @@ pub unsafe trait NativeType: } macro_rules! create_native { - ($native_ty:ty,$($impl_pattern:pat)|+) => { + ($native_ty:ty,$($impl_pattern:pat_param)|+) => { unsafe impl NativeType for $native_ty { type Bytes = [u8; std::mem::size_of::()]; diff --git a/parquet/src/data_type.rs b/parquet/src/data_type.rs index 3573362744fe..dadcba1e23a8 100644 --- a/parquet/src/data_type.rs +++ b/parquet/src/data_type.rs @@ -1265,7 +1265,7 @@ impl FromBytes for FixedLenByteArray { /// Macro to reduce repetition in making type assertions on the physical type against `T` macro_rules! ensure_phys_ty { - ($($ty: pat)|+ , $err: literal) => { + ($($ty:pat_param)|+ , $err: literal) => { match T::get_physical_type() { $($ty => (),)* _ => panic!($err), diff --git a/parquet_derive/src/lib.rs b/parquet_derive/src/lib.rs index 1c53227e7977..6d751500e949 100644 --- a/parquet_derive/src/lib.rs +++ b/parquet_derive/src/lib.rs @@ -100,7 +100,7 @@ pub fn parquet_record_writer(input: proc_macro::TokenStream) -> proc_macro::Toke field_infos.iter().map(|x| x.parquet_type()).collect(); (quote! { - impl#generics RecordWriter<#derived_for#generics> for &[#derived_for#generics] { + impl #generics RecordWriter<#derived_for #generics> for &[#derived_for #generics] { fn write_to_row_group( &self, row_group_writer: &mut Box