From 4e40312b7c3c266710ee5730fbc7fc163262efac Mon Sep 17 00:00:00 2001 From: mqy Date: Sat, 26 Dec 2020 07:11:38 +0800 Subject: [PATCH] ARROW-11034: [Rust] rustfmt: remove ignore list --- rust/datafusion/src/scalar.rs | 31 +++++++++++++++++-------------- rust/parquet/src/record/api.rs | 5 ++++- rust/rustfmt.toml | 6 +++--- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/rust/datafusion/src/scalar.rs b/rust/datafusion/src/scalar.rs index 321271ef93cd..2a2d4d8daf90 100644 --- a/rust/datafusion/src/scalar.rs +++ b/rust/datafusion/src/scalar.rs @@ -163,20 +163,23 @@ impl ScalarValue { /// whether this value is null or not. pub fn is_null(&self) -> bool { - matches!(*self, ScalarValue::Boolean(None) - | ScalarValue::UInt8(None) - | ScalarValue::UInt16(None) - | ScalarValue::UInt32(None) - | ScalarValue::UInt64(None) - | ScalarValue::Int8(None) - | ScalarValue::Int16(None) - | ScalarValue::Int32(None) - | ScalarValue::Int64(None) - | ScalarValue::Float32(None) - | ScalarValue::Float64(None) - | ScalarValue::Utf8(None) - | ScalarValue::LargeUtf8(None) - | ScalarValue::List(None, _)) + matches!( + *self, + ScalarValue::Boolean(None) + | ScalarValue::UInt8(None) + | ScalarValue::UInt16(None) + | ScalarValue::UInt32(None) + | ScalarValue::UInt64(None) + | ScalarValue::Int8(None) + | ScalarValue::Int16(None) + | ScalarValue::Int32(None) + | ScalarValue::Int64(None) + | ScalarValue::Float32(None) + | ScalarValue::Float64(None) + | ScalarValue::Utf8(None) + | ScalarValue::LargeUtf8(None) + | ScalarValue::List(None, _) + ) } /// Converts a scalar value into an 1-row array. diff --git a/rust/parquet/src/record/api.rs b/rust/parquet/src/record/api.rs index d692bc95a781..61a528030233 100644 --- a/rust/parquet/src/record/api.rs +++ b/rust/parquet/src/record/api.rs @@ -537,7 +537,10 @@ impl Field { /// Determines if this Row represents a primitive value. pub fn is_primitive(&self) -> bool { - !matches!(*self, Field::Group(_) | Field::ListInternal(_) | Field::MapInternal(_)) + !matches!( + *self, + Field::Group(_) | Field::ListInternal(_) | Field::MapInternal(_) + ) } /// Converts Parquet BOOLEAN type with logical type into `bool` value. diff --git a/rust/rustfmt.toml b/rust/rustfmt.toml index d9ad6496fe16..c114c6f1b73b 100644 --- a/rust/rustfmt.toml +++ b/rust/rustfmt.toml @@ -18,6 +18,6 @@ max_width = 90 # ignore generated files -ignore = [ - "arrow/src/ipc/gen", -] \ No newline at end of file +# ignore = [ +# "arrow/src/ipc/gen", +#] \ No newline at end of file