diff --git a/arrow-array/src/array/byte_array.rs b/arrow-array/src/array/byte_array.rs index 442e795cec52..078a081957bb 100644 --- a/arrow-array/src/array/byte_array.rs +++ b/arrow-array/src/array/byte_array.rs @@ -21,7 +21,7 @@ use crate::iterator::ArrayIter; use crate::types::bytes::ByteArrayNativeType; use crate::types::ByteArrayType; use crate::{Array, ArrayAccessor, OffsetSizeTrait}; -use arrow_buffer::buffer::OffsetBuffer; +use arrow_buffer::OffsetBuffer; use arrow_buffer::{ArrowNativeType, Buffer}; use arrow_data::ArrayData; use arrow_schema::DataType; diff --git a/arrow-array/src/array/list_array.rs b/arrow-array/src/array/list_array.rs index 178139f810e7..830e307f05fa 100644 --- a/arrow-array/src/array/list_array.rs +++ b/arrow-array/src/array/list_array.rs @@ -20,8 +20,8 @@ use crate::builder::{GenericListBuilder, PrimitiveBuilder}; use crate::{ iterator::GenericListArrayIter, Array, ArrayAccessor, ArrayRef, ArrowPrimitiveType, }; -use arrow_buffer::buffer::OffsetBuffer; use arrow_buffer::ArrowNativeType; +use arrow_buffer::OffsetBuffer; use arrow_data::ArrayData; use arrow_schema::{ArrowError, DataType, Field}; use num::Integer; diff --git a/arrow-array/src/array/map_array.rs b/arrow-array/src/array/map_array.rs index 8c9b02921781..923a64fc0a8e 100644 --- a/arrow-array/src/array/map_array.rs +++ b/arrow-array/src/array/map_array.rs @@ -17,7 +17,7 @@ use crate::array::{get_offsets, print_long_array}; use crate::{make_array, Array, ArrayRef, StringArray, StructArray}; -use arrow_buffer::buffer::OffsetBuffer; +use arrow_buffer::OffsetBuffer; use arrow_buffer::{ArrowNativeType, Buffer, ToByteSlice}; use arrow_data::ArrayData; use arrow_schema::{ArrowError, DataType, Field}; diff --git a/arrow-array/src/array/mod.rs b/arrow-array/src/array/mod.rs index dfdaac85bf85..ba63a19aafd6 100644 --- a/arrow-array/src/array/mod.rs +++ b/arrow-array/src/array/mod.rs @@ -20,8 +20,7 @@ mod binary_array; use crate::types::*; -use arrow_buffer::buffer::{OffsetBuffer, ScalarBuffer}; -use arrow_buffer::ArrowNativeType; +use arrow_buffer::{ArrowNativeType, OffsetBuffer, ScalarBuffer}; use arrow_data::ArrayData; use arrow_schema::{DataType, IntervalUnit, TimeUnit}; use std::any::Any; diff --git a/arrow-array/src/array/primitive_array.rs b/arrow-array/src/array/primitive_array.rs index d792f6819ae5..0e78083c4795 100644 --- a/arrow-array/src/array/primitive_array.rs +++ b/arrow-array/src/array/primitive_array.rs @@ -25,8 +25,7 @@ use crate::timezone::Tz; use crate::trusted_len::trusted_len_unzip; use crate::{types::*, ArrowNativeTypeOp}; use crate::{Array, ArrayAccessor}; -use arrow_buffer::buffer::ScalarBuffer; -use arrow_buffer::{i256, ArrowNativeType, Buffer}; +use arrow_buffer::{i256, ArrowNativeType, Buffer, ScalarBuffer}; use arrow_data::bit_iterator::try_for_each_valid_idx; use arrow_data::ArrayData; use arrow_schema::{ArrowError, DataType}; diff --git a/arrow-array/src/array/run_array.rs b/arrow-array/src/array/run_array.rs index e50903f30f9b..5b7f7fb9e407 100644 --- a/arrow-array/src/array/run_array.rs +++ b/arrow-array/src/array/run_array.rs @@ -17,8 +17,7 @@ use std::any::Any; -use arrow_buffer::buffer::RunEndBuffer; -use arrow_buffer::ArrowNativeType; +use arrow_buffer::{ArrowNativeType, RunEndBuffer}; use arrow_data::{ArrayData, ArrayDataBuilder}; use arrow_schema::{ArrowError, DataType, Field}; diff --git a/arrow-array/src/array/struct_array.rs b/arrow-array/src/array/struct_array.rs index 35d4444e0117..3c4ddef407c7 100644 --- a/arrow-array/src/array/struct_array.rs +++ b/arrow-array/src/array/struct_array.rs @@ -16,8 +16,7 @@ // under the License. use crate::{make_array, Array, ArrayRef}; -use arrow_buffer::buffer::buffer_bin_or; -use arrow_buffer::Buffer; +use arrow_buffer::{buffer_bin_or, Buffer}; use arrow_data::ArrayData; use arrow_schema::{ArrowError, DataType, Field}; use std::{any::Any, ops::Index}; diff --git a/arrow-array/src/lib.rs b/arrow-array/src/lib.rs index bfdc35c6ce5d..ada59564bf0e 100644 --- a/arrow-array/src/lib.rs +++ b/arrow-array/src/lib.rs @@ -152,7 +152,7 @@ //! //! [Arrow specification]: https://arrow.apache.org/docs/format/Columnar.html //! [`&dyn Array`]: Array -//! [`NullBuffer`]: arrow_buffer::buffer::NullBuffer +//! [`NullBuffer`]: arrow_buffer::NullBuffer //! [`Buffer`]: arrow_buffer::Buffer //! [`compute`]: https://docs.rs/arrow/latest/arrow/compute/index.html //! [`json`]: https://docs.rs/arrow/latest/arrow/json/index.html diff --git a/arrow-buffer/src/lib.rs b/arrow-buffer/src/lib.rs index 13d44e4d57ff..364e92db229c 100644 --- a/arrow-buffer/src/lib.rs +++ b/arrow-buffer/src/lib.rs @@ -19,7 +19,7 @@ pub mod alloc; pub mod buffer; -pub use buffer::{Buffer, MutableBuffer}; +pub use buffer::*; mod bigint; mod bytes;