Skip to content

Cherry pick run results of cargo --fix for edition 2021 to active_release #719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions arrow-flight/src/arrow.flight.protocol.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<
Expand Down Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion arrow/src/alloc/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>()];

Expand Down
2 changes: 1 addition & 1 deletion parquet/src/data_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion parquet_derive/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down