diff --git a/src/array/binary/mutable.rs b/src/array/binary/mutable.rs index 9990a542c2d..229769a5e4b 100644 --- a/src/array/binary/mutable.rs +++ b/src/array/binary/mutable.rs @@ -136,7 +136,7 @@ impl MutableBinaryArray { let value = self.values.split_off(value_start); self.validity .as_mut() - .map(|x| x.pop()?.then(|| ())) + .map(|x| x.pop()?.then_some(())) .unwrap_or_else(|| Some(())) .map(|_| value) } diff --git a/src/array/boolean/mutable.rs b/src/array/boolean/mutable.rs index 83fac4b7ef5..4a3fd298311 100644 --- a/src/array/boolean/mutable.rs +++ b/src/array/boolean/mutable.rs @@ -110,7 +110,7 @@ impl MutableBooleanArray { let value = self.values.pop()?; self.validity .as_mut() - .map(|x| x.pop()?.then(|| value)) + .map(|x| x.pop()?.then_some(value)) .unwrap_or_else(|| Some(value)) } diff --git a/src/array/fixed_size_binary/mutable.rs b/src/array/fixed_size_binary/mutable.rs index dc70e49e4ac..b49809cfc70 100644 --- a/src/array/fixed_size_binary/mutable.rs +++ b/src/array/fixed_size_binary/mutable.rs @@ -122,7 +122,7 @@ impl MutableFixedSizeBinaryArray { let value = self.values.split_off(value_start); self.validity .as_mut() - .map(|x| x.pop()?.then(|| ())) + .map(|x| x.pop()?.then_some(())) .unwrap_or_else(|| Some(())) .map(|_| value) } diff --git a/src/array/primitive/mutable.rs b/src/array/primitive/mutable.rs index 5f2014db319..f03a579239f 100644 --- a/src/array/primitive/mutable.rs +++ b/src/array/primitive/mutable.rs @@ -160,7 +160,7 @@ impl MutablePrimitiveArray { let value = self.values.pop()?; self.validity .as_mut() - .map(|x| x.pop()?.then(|| value)) + .map(|x| x.pop()?.then_some(value)) .unwrap_or_else(|| Some(value)) } diff --git a/src/array/utf8/mutable.rs b/src/array/utf8/mutable.rs index 0b87b97c25c..eddf91bf6b7 100644 --- a/src/array/utf8/mutable.rs +++ b/src/array/utf8/mutable.rs @@ -213,7 +213,7 @@ impl MutableUtf8Array { let value = self.values.split_off(value_start); self.validity .as_mut() - .map(|x| x.pop()?.then(|| ())) + .map(|x| x.pop()?.then_some(())) .unwrap_or_else(|| Some(())) .map(|_| // soundness: we always check for utf8 soundness on constructors. diff --git a/src/io/parquet/write/dictionary.rs b/src/io/parquet/write/dictionary.rs index 2abffd98a49..fce32c5c60c 100644 --- a/src/io/parquet/write/dictionary.rs +++ b/src/io/parquet/write/dictionary.rs @@ -47,7 +47,7 @@ fn serialize_keys_values( // discard indices whose values are null. let keys = keys .zip(validity.iter()) - .filter_map(|(key, is_valid)| is_valid.then(|| key)); + .filter_map(|(key, is_valid)| is_valid.then_some(key)); let num_bits = utils::get_bit_width(keys.clone().max().unwrap_or(0) as u64); let keys = utils::ExactSizedIter::new(keys, array.len() - validity.unset_bits());