From 08ace6b6fa0c7fd49bad58a1484229fe75e07707 Mon Sep 17 00:00:00 2001 From: Weston Pace Date: Thu, 3 Apr 2025 07:05:06 -0700 Subject: [PATCH] Apply clippy suggestions newly introduced in rust 1.86 --- arrow-buffer/src/bigint/div.rs | 4 ++-- arrow-buffer/src/util/bit_chunk_iterator.rs | 2 +- arrow/benches/buffer_create.rs | 2 +- parquet/src/arrow/array_reader/fixed_size_list_array.rs | 2 +- parquet/src/arrow/array_reader/list_array.rs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arrow-buffer/src/bigint/div.rs b/arrow-buffer/src/bigint/div.rs index bc94e1c4577..f094f662ccf 100644 --- a/arrow-buffer/src/bigint/div.rs +++ b/arrow-buffer/src/bigint/div.rs @@ -39,8 +39,8 @@ pub fn div_rem(numerator: &[u64; N], divisor: &[u64; N]) -> ([u6 return div_rem_small(numerator, divisor[0]); } - let numerator_words = (numerator_bits + 63) / 64; - let divisor_words = (divisor_bits + 63) / 64; + let numerator_words = numerator_bits.div_ceil(64); + let divisor_words = divisor_bits.div_ceil(64); let n = divisor_words; let m = numerator_words - divisor_words; diff --git a/arrow-buffer/src/util/bit_chunk_iterator.rs b/arrow-buffer/src/util/bit_chunk_iterator.rs index 0562c7ad599..ea8e8f472ac 100644 --- a/arrow-buffer/src/util/bit_chunk_iterator.rs +++ b/arrow-buffer/src/util/bit_chunk_iterator.rs @@ -53,7 +53,7 @@ impl<'a> UnalignedBitChunk<'a> { let byte_offset = offset / 8; let offset_padding = offset % 8; - let bytes_len = (len + offset_padding + 7) / 8; + let bytes_len = (len + offset_padding).div_ceil(8); let buffer = &buffer[byte_offset..byte_offset + bytes_len]; let prefix_mask = compute_prefix_mask(offset_padding); diff --git a/arrow/benches/buffer_create.rs b/arrow/benches/buffer_create.rs index f6199ccab55..2c4d0d6a996 100644 --- a/arrow/benches/buffer_create.rs +++ b/arrow/benches/buffer_create.rs @@ -50,7 +50,7 @@ fn mutable_buffer_iter_bitset(data: &[Vec]) -> Vec { data.iter() .map(|datum| { let mut result = - MutableBuffer::new((data.len() + 7) / 8).with_bitset(datum.len(), false); + MutableBuffer::new(data.len().div_ceil(8)).with_bitset(datum.len(), false); for (i, value) in datum.iter().enumerate() { if *value { unsafe { diff --git a/parquet/src/arrow/array_reader/fixed_size_list_array.rs b/parquet/src/arrow/array_reader/fixed_size_list_array.rs index 43a9037d4a7..5750ef94e3e 100644 --- a/parquet/src/arrow/array_reader/fixed_size_list_array.rs +++ b/parquet/src/arrow/array_reader/fixed_size_list_array.rs @@ -77,7 +77,7 @@ impl ArrayReader for FixedSizeListArrayReader { fn consume_batch(&mut self) -> Result { let next_batch_array = self.item_reader.consume_batch()?; - if next_batch_array.len() == 0 { + if next_batch_array.is_empty() { return Ok(new_empty_array(&self.data_type)); } diff --git a/parquet/src/arrow/array_reader/list_array.rs b/parquet/src/arrow/array_reader/list_array.rs index 6e583ed00c1..06448d5f6ff 100644 --- a/parquet/src/arrow/array_reader/list_array.rs +++ b/parquet/src/arrow/array_reader/list_array.rs @@ -83,7 +83,7 @@ impl ArrayReader for ListArrayReader { fn consume_batch(&mut self) -> Result { let next_batch_array = self.item_reader.consume_batch()?; - if next_batch_array.len() == 0 { + if next_batch_array.is_empty() { return Ok(new_empty_array(&self.data_type)); }