[arrow-rs] branch active_release updated: fix edition 2021 (#714) (#719)

[alamb]

This is an automated email from the ASF dual-hosted git repository.

alamb pushed a commit to branch active_release
in repository https://gitbox.apache.org/repos/asf/arrow-rs.git


The following commit(s) were added to refs/heads/active_release by this push:
     new 559db29  fix edition 2021 (#714) (#719)
559db29 is described below

commit 559db29d7f1a529487a4a9b3502d102ffd9ec932
Author: Andrew Lamb <and...@nerdnetworks.org>
AuthorDate: Thu Aug 26 13:47:47 2021 -0400

    fix edition 2021 (#714) (#719)
    
    Co-authored-by: Jiayu Liu <jimex...@users.noreply.github.com>
---
 arrow-flight/src/arrow.flight.protocol.rs | 4 ++--
 arrow/src/alloc/types.rs                  | 2 +-
 parquet/src/data_type.rs                  | 2 +-
 parquet_derive/src/lib.rs                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arrow-flight/src/arrow.flight.protocol.rs 
b/arrow-flight/src/arrow.flight.protocol.rs
index 79c6a94..b1a79ee 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<InterceptedService<T, F>>
         where
-            F: FnMut(tonic::Request<()>) -> Result<tonic::Request<()>, 
tonic::Status>,
+            F: tonic::service::Interceptor,
             T: tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
                 Response = http::Response<
@@ -666,7 +666,7 @@ pub mod flight_service_server {
             interceptor: F,
         ) -> InterceptedService<Self, F>
         where
-            F: FnMut(tonic::Request<()>) -> Result<tonic::Request<()>, 
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 c1f0ef9..92a6107 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::<Self>()];
 
diff --git a/parquet/src/data_type.rs b/parquet/src/data_type.rs
index 3573362..dadcba1 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 1c53227..6d75150 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<parquet::file::writer::RowGroupWriter>