From 080377020e7de74689a8fdf42b96fc1370c91799 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Fri, 1 Jul 2022 11:35:46 +0800 Subject: [PATCH] chore: Make rust clippy happy Signed-off-by: Xuanwo --- examples/ipc_file_read.rs | 1 + src/bitmap/assign_ops.rs | 12 ++++++------ src/chunk.rs | 2 +- src/io/avro/mod.rs | 4 ++-- src/io/avro/read/decompress.rs | 2 +- src/io/parquet/read/deserialize/nested_utils.rs | 2 +- src/io/parquet/read/deserialize/primitive/basic.rs | 2 +- src/io/parquet/read/deserialize/primitive/nested.rs | 2 +- src/io/parquet/read/statistics/mod.rs | 12 +++++------- src/lib.rs | 2 ++ src/scalar/binary.rs | 2 +- src/scalar/boolean.rs | 2 +- src/scalar/fixed_size_binary.rs | 2 +- src/scalar/primitive.rs | 2 +- src/scalar/utf8.rs | 2 +- 15 files changed, 26 insertions(+), 25 deletions(-) diff --git a/examples/ipc_file_read.rs b/examples/ipc_file_read.rs index 6478b25d484..18ceed0ba84 100644 --- a/examples/ipc_file_read.rs +++ b/examples/ipc_file_read.rs @@ -8,6 +8,7 @@ use arrow2::io::ipc::read; use arrow2::io::print; /// Simplest way: read all record batches from the file. This can be used e.g. for random access. +#[allow(clippy::type_complexity)] fn read_batches(path: &str) -> Result<(Schema, Vec>>)> { let mut file = File::open(path)?; diff --git a/src/bitmap/assign_ops.rs b/src/bitmap/assign_ops.rs index 81ded04578c..fe8f2805981 100644 --- a/src/bitmap/assign_ops.rs +++ b/src/bitmap/assign_ops.rs @@ -118,14 +118,14 @@ fn or_assign(lhs: &mut MutableBitmap, rhs: &Bitmap) { } } -impl<'a, 'b> std::ops::BitOrAssign<&'a Bitmap> for &'b mut MutableBitmap { +impl<'a> std::ops::BitOrAssign<&'a Bitmap> for &mut MutableBitmap { #[inline] fn bitor_assign(&mut self, rhs: &'a Bitmap) { or_assign::(self, rhs) } } -impl<'a, 'b> std::ops::BitOr<&'a Bitmap> for MutableBitmap { +impl<'a> std::ops::BitOr<&'a Bitmap> for MutableBitmap { type Output = Self; #[inline] @@ -150,14 +150,14 @@ fn and_assign(lhs: &mut MutableBitmap, rhs: &Bitmap) { } } -impl<'a, 'b> std::ops::BitAndAssign<&'a Bitmap> for &'b mut MutableBitmap { +impl<'a> std::ops::BitAndAssign<&'a Bitmap> for &mut MutableBitmap { #[inline] fn bitand_assign(&mut self, rhs: &'a Bitmap) { and_assign::(self, rhs) } } -impl<'a, 'b> std::ops::BitAnd<&'a Bitmap> for MutableBitmap { +impl<'a> std::ops::BitAnd<&'a Bitmap> for MutableBitmap { type Output = Self; #[inline] @@ -173,14 +173,14 @@ fn xor_assign(lhs: &mut MutableBitmap, rhs: &Bitmap) { binary_assign(lhs, rhs, |x: T, y| x ^ y) } -impl<'a, 'b> std::ops::BitXorAssign<&'a Bitmap> for &'b mut MutableBitmap { +impl<'a> std::ops::BitXorAssign<&'a Bitmap> for &mut MutableBitmap { #[inline] fn bitxor_assign(&mut self, rhs: &'a Bitmap) { xor_assign::(self, rhs) } } -impl<'a, 'b> std::ops::BitXor<&'a Bitmap> for MutableBitmap { +impl<'a> std::ops::BitXor<&'a Bitmap> for MutableBitmap { type Output = Self; #[inline] diff --git a/src/chunk.rs b/src/chunk.rs index 499f0f27fad..ffc857bcc13 100644 --- a/src/chunk.rs +++ b/src/chunk.rs @@ -6,7 +6,7 @@ use crate::error::{Error, Result}; /// A vector of trait objects of [`Array`] where every item has /// the same length, [`Chunk::len`]. -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, PartialEq, Eq)] pub struct Chunk> { arrays: Vec, } diff --git a/src/io/avro/mod.rs b/src/io/avro/mod.rs index d502e3aeb80..852915d9006 100644 --- a/src/io/avro/mod.rs +++ b/src/io/avro/mod.rs @@ -93,7 +93,7 @@ macro_rules! read_metadata { pub(crate) use {avro_decode, read_header, read_metadata}; /// A compressed Avro block. -#[derive(Debug, Clone, Default, PartialEq)] +#[derive(Debug, Clone, Default, PartialEq, Eq)] pub struct CompressedBlock { /// The number of rows pub number_of_rows: usize, @@ -112,7 +112,7 @@ impl CompressedBlock { } /// An uncompressed Avro block. -#[derive(Debug, Clone, Default, PartialEq)] +#[derive(Debug, Clone, Default, PartialEq, Eq)] pub struct Block { /// The number of rows pub number_of_rows: usize, diff --git a/src/io/avro/read/decompress.rs b/src/io/avro/read/decompress.rs index 05f5fd43d92..bc5fcbd5825 100644 --- a/src/io/avro/read/decompress.rs +++ b/src/io/avro/read/decompress.rs @@ -96,7 +96,7 @@ impl Decompressor { } } -impl<'a, R: Read> FallibleStreamingIterator for Decompressor { +impl FallibleStreamingIterator for Decompressor { type Error = Error; type Item = Block; diff --git a/src/io/parquet/read/deserialize/nested_utils.rs b/src/io/parquet/read/deserialize/nested_utils.rs index 5c7f062f969..637cdf89197 100644 --- a/src/io/parquet/read/deserialize/nested_utils.rs +++ b/src/io/parquet/read/deserialize/nested_utils.rs @@ -235,7 +235,7 @@ where } } -#[derive(Debug, Clone, Copy, PartialEq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum InitNested { Primitive(bool), List(bool), diff --git a/src/io/parquet/read/deserialize/primitive/basic.rs b/src/io/parquet/read/deserialize/primitive/basic.rs index 6e947b5643b..eddf95872d4 100644 --- a/src/io/parquet/read/deserialize/primitive/basic.rs +++ b/src/io/parquet/read/deserialize/primitive/basic.rs @@ -132,7 +132,7 @@ where op: F, } -impl<'a, T, P, F> PrimitiveDecoder +impl PrimitiveDecoder where T: NativeType, P: ParquetNativeType, diff --git a/src/io/parquet/read/deserialize/primitive/nested.rs b/src/io/parquet/read/deserialize/primitive/nested.rs index 92631372989..4a2192e6237 100644 --- a/src/io/parquet/read/deserialize/primitive/nested.rs +++ b/src/io/parquet/read/deserialize/primitive/nested.rs @@ -54,7 +54,7 @@ where op: F, } -impl<'a, T, P, F> PrimitiveDecoder +impl PrimitiveDecoder where T: NativeType, P: ParquetNativeType, diff --git a/src/io/parquet/read/statistics/mod.rs b/src/io/parquet/read/statistics/mod.rs index a5916a98792..ff9449f0be9 100644 --- a/src/io/parquet/read/statistics/mod.rs +++ b/src/io/parquet/read/statistics/mod.rs @@ -414,12 +414,10 @@ fn push( // some implementations of parquet write arrow's u32 into i64. ParquetPhysicalType::Int64 => primitive::push(from, min, max, |x: i64| Ok(x as u32)), ParquetPhysicalType::Int32 => primitive::push(from, min, max, |x: i32| Ok(x as u32)), - other => { - return Err(Error::NotYetImplemented(format!( - "Can't decode UInt32 type from parquet type {:?}", - other - ))) - } + other => Err(Error::NotYetImplemented(format!( + "Can't decode UInt32 type from parquet type {:?}", + other + ))), }, Int32 => primitive::push(from, min, max, |x: i32| Ok(x as i32)), Int64 | Date64 | Time64(_) | Duration(_) => { @@ -442,7 +440,7 @@ fn push( ParquetPhysicalType::Int32 => primitive::push(from, min, max, |x: i32| Ok(x as i128)), ParquetPhysicalType::Int64 => primitive::push(from, min, max, |x: i64| Ok(x as i128)), ParquetPhysicalType::FixedLenByteArray(n) if *n > 16 => { - return Err(Error::NotYetImplemented(format!( + Err(Error::NotYetImplemented(format!( "Can't decode Decimal128 type from Fixed Size Byte Array of len {:?}", n ))) diff --git a/src/lib.rs b/src/lib.rs index ec01cec8755..03963841b54 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,6 +6,8 @@ #![allow(clippy::len_without_is_empty)] // Trait objects must be returned as a &Box so that they can be cloned #![allow(clippy::borrowed_box)] +// Allow type complexity warning to avoid API break. +#![allow(clippy::type_complexity)] #![cfg_attr(docsrs, feature(doc_cfg))] #![cfg_attr(feature = "simd", feature(portable_simd))] diff --git a/src/scalar/binary.rs b/src/scalar/binary.rs index 7b6c0b98240..70a9be40374 100644 --- a/src/scalar/binary.rs +++ b/src/scalar/binary.rs @@ -3,7 +3,7 @@ use crate::{array::*, datatypes::DataType}; use super::Scalar; /// The [`Scalar`] implementation of binary ([`Option>`]). -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, PartialEq, Eq)] pub struct BinaryScalar { value: Option>, phantom: std::marker::PhantomData, diff --git a/src/scalar/boolean.rs b/src/scalar/boolean.rs index 47c3f9a9bc9..a31cf1947f5 100644 --- a/src/scalar/boolean.rs +++ b/src/scalar/boolean.rs @@ -3,7 +3,7 @@ use crate::datatypes::DataType; use super::Scalar; /// The [`Scalar`] implementation of a boolean. -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, PartialEq, Eq)] pub struct BooleanScalar { value: Option, } diff --git a/src/scalar/fixed_size_binary.rs b/src/scalar/fixed_size_binary.rs index c09466f9eb3..dfa4ace341c 100644 --- a/src/scalar/fixed_size_binary.rs +++ b/src/scalar/fixed_size_binary.rs @@ -2,7 +2,7 @@ use crate::datatypes::DataType; use super::Scalar; -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, PartialEq, Eq)] /// The [`Scalar`] implementation of fixed size binary ([`Option>`]). pub struct FixedSizeBinaryScalar { value: Option>, diff --git a/src/scalar/primitive.rs b/src/scalar/primitive.rs index 431906f759c..158701c6bd5 100644 --- a/src/scalar/primitive.rs +++ b/src/scalar/primitive.rs @@ -4,7 +4,7 @@ use super::Scalar; /// The implementation of [`Scalar`] for primitive, semantically equivalent to [`Option`] /// with [`DataType`]. -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, PartialEq, Eq)] pub struct PrimitiveScalar { value: Option, data_type: DataType, diff --git a/src/scalar/utf8.rs b/src/scalar/utf8.rs index 3fad8a4a48a..f62581eccbc 100644 --- a/src/scalar/utf8.rs +++ b/src/scalar/utf8.rs @@ -3,7 +3,7 @@ use crate::{array::*, datatypes::DataType}; use super::Scalar; /// The implementation of [`Scalar`] for utf8, semantically equivalent to [`Option`]. -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, PartialEq, Eq)] pub struct Utf8Scalar { value: Option, phantom: std::marker::PhantomData,