diff --git a/Cargo.toml b/Cargo.toml index c5527fc41cca..bf2274a40306 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,7 +74,7 @@ include = [ "Cargo.toml", ] edition = "2021" -rust-version = "1.75" +rust-version = "1.70" [workspace.dependencies] arrow = { version = "53.2.0", path = "./arrow", default-features = false } diff --git a/arrow-buffer/src/buffer/immutable.rs b/arrow-buffer/src/buffer/immutable.rs index 4c100ab07bd6..7254313b7da5 100644 --- a/arrow-buffer/src/buffer/immutable.rs +++ b/arrow-buffer/src/buffer/immutable.rs @@ -23,7 +23,7 @@ use std::sync::Arc; use crate::alloc::{Allocation, Deallocation, ALIGNMENT}; use crate::util::bit_chunk_iterator::{BitChunks, UnalignedBitChunk}; use crate::BufferBuilder; -use crate::{bytes::Bytes, native::ArrowNativeType}; +use crate::{bit_util, bytes::Bytes, native::ArrowNativeType}; use super::ops::bitwise_unary_op_helper; use super::{MutableBuffer, ScalarBuffer}; @@ -265,7 +265,7 @@ impl Buffer { /// otherwise a new buffer is allocated and filled with a copy of the bits in the range. pub fn bit_slice(&self, offset: usize, len: usize) -> Self { if offset % 8 == 0 { - return self.slice_with_length(offset / 8, len.div_ceil(8)); + return self.slice_with_length(offset / 8, bit_util::ceil(len, 8)); } bitwise_unary_op_helper(self, offset, len, |a| a) @@ -868,7 +868,7 @@ mod tests { let assert_preserved = |offset: usize, len: usize| { let new_buf = buf.bit_slice(offset, len); - assert_eq!(new_buf.len(), len.div_ceil(8)); + assert_eq!(new_buf.len(), bit_util::ceil(len, 8)); // if the offset is not byte-aligned, we have to create a deep copy to a new buffer // (since the `offset` value inside a Buffer is byte-granular, not bit-granular), so diff --git a/arrow-pyarrow-integration-testing/Cargo.toml b/arrow-pyarrow-integration-testing/Cargo.toml index 0834f2d13384..630c4218352c 100644 --- a/arrow-pyarrow-integration-testing/Cargo.toml +++ b/arrow-pyarrow-integration-testing/Cargo.toml @@ -25,7 +25,7 @@ authors = ["Apache Arrow "] license = "Apache-2.0" keywords = [ "arrow" ] edition = "2021" -rust-version = "1.62" +rust-version = { workspace = true } publish = false [lib] diff --git a/arrow/Cargo.toml b/arrow/Cargo.toml index a0fd96415a1d..c8e162ff9b02 100644 --- a/arrow/Cargo.toml +++ b/arrow/Cargo.toml @@ -31,7 +31,7 @@ include = [ "Cargo.toml", ] edition = { workspace = true } -rust-version = "1.70.0" +rust-version = { workspace = true } [lib] name = "arrow" diff --git a/object_store/Cargo.toml b/object_store/Cargo.toml index 86d1392ebf61..c79e42a167d8 100644 --- a/object_store/Cargo.toml +++ b/object_store/Cargo.toml @@ -24,7 +24,7 @@ readme = "README.md" description = "A generic object store interface for uniformly interacting with AWS S3, Google Cloud Storage, Azure Blob Storage and local files." keywords = ["object", "storage", "cloud"] repository = "https://github.com/apache/arrow-rs/tree/master/object_store" -rust-version = "1.64.0" +rust-version = "1.70.0" [package.metadata.docs.rs] all-features = true