From 82b9775aee7c427e83398d93883c94e8321d072c Mon Sep 17 00:00:00 2001
From: Andrew Duffy <andreweduffy@gmail.com>
Date: Wed, 7 Aug 2024 23:41:22 -0400
Subject: [PATCH] revert

---
 encodings/alp/src/array.rs                                | 2 +-
 encodings/alp/src/compress.rs                             | 3 +--
 encodings/byte-bool/src/compute/mod.rs                    | 4 ++--
 encodings/byte-bool/src/lib.rs                            | 2 +-
 encodings/datetime-parts/src/compress.rs                  | 3 +--
 encodings/datetime-parts/src/compute.rs                   | 8 +++-----
 encodings/dict/benches/dict_compress.rs                   | 3 +--
 encodings/dict/src/compress.rs                            | 6 ++----
 encodings/dict/src/compute.rs                             | 3 +--
 encodings/dict/src/dict.rs                                | 2 +-
 encodings/fastlanes/benches/bitpacking_take.rs            | 3 +--
 encodings/fastlanes/src/bitpacking/compress.rs            | 3 +--
 .../fastlanes/src/bitpacking/compute/search_sorted.rs     | 5 ++---
 encodings/fastlanes/src/bitpacking/compute/slice.rs       | 2 +-
 encodings/fastlanes/src/bitpacking/compute/take.rs        | 7 ++-----
 encodings/fastlanes/src/bitpacking/mod.rs                 | 4 ++--
 encodings/fastlanes/src/delta/compress.rs                 | 2 +-
 encodings/fastlanes/src/for/compress.rs                   | 3 +--
 encodings/fastlanes/src/for/compute.rs                    | 2 +-
 encodings/roaring/src/boolean/compress.rs                 | 2 +-
 encodings/roaring/src/boolean/mod.rs                      | 4 ++--
 encodings/roaring/src/integer/compress.rs                 | 2 +-
 encodings/roaring/src/integer/mod.rs                      | 4 ++--
 encodings/runend-bool/src/array.rs                        | 2 +-
 encodings/runend-bool/src/compress.rs                     | 5 ++---
 encodings/runend-bool/src/compute.rs                      | 2 +-
 encodings/runend/src/compress.rs                          | 4 ++--
 encodings/runend/src/compute.rs                           | 4 ++--
 encodings/runend/src/runend.rs                            | 2 +-
 encodings/zigzag/src/compress.rs                          | 2 +-
 encodings/zigzag/src/zigzag.rs                            | 2 +-
 31 files changed, 43 insertions(+), 59 deletions(-)

diff --git a/encodings/alp/src/array.rs b/encodings/alp/src/array.rs
index 267a57bd5a..cfc648ba51 100644
--- a/encodings/alp/src/array.rs
+++ b/encodings/alp/src/array.rs
@@ -1,7 +1,7 @@
 use std::fmt::Debug;
 
 use serde::{Deserialize, Serialize};
-use vortex::array::primitive::PrimitiveArray;
+use vortex::array::PrimitiveArray;
 use vortex::stats::ArrayStatisticsCompute;
 use vortex::validity::{ArrayValidity, LogicalValidity};
 use vortex::variants::{ArrayVariants, PrimitiveArrayTrait};
diff --git a/encodings/alp/src/compress.rs b/encodings/alp/src/compress.rs
index bda2cae993..c9265d2e58 100644
--- a/encodings/alp/src/compress.rs
+++ b/encodings/alp/src/compress.rs
@@ -1,6 +1,5 @@
 use itertools::Itertools;
-use vortex::array::primitive::PrimitiveArray;
-use vortex::array::sparse::{Sparse, SparseArray};
+use vortex::array::{PrimitiveArray, Sparse, SparseArray};
 use vortex::validity::Validity;
 use vortex::{Array, ArrayDType, ArrayDef, IntoArray, IntoArrayVariant};
 use vortex_dtype::{NativePType, PType};
diff --git a/encodings/byte-bool/src/compute/mod.rs b/encodings/byte-bool/src/compute/mod.rs
index c5e33a0434..5afd2c1caa 100644
--- a/encodings/byte-bool/src/compute/mod.rs
+++ b/encodings/byte-bool/src/compute/mod.rs
@@ -5,7 +5,7 @@ use num_traits::AsPrimitive;
 use vortex::compute::unary::{FillForwardFn, ScalarAtFn};
 use vortex::compute::{ArrayCompute, CompareFn, SliceFn, TakeFn};
 use vortex::validity::{ArrayValidity, Validity};
-use vortex::{Array, ArrayDType, IntoArray, IntoArrayVariant, ToArrayData};
+use vortex::{Array, ArrayDType, IntoArray, IntoArrayVariant};
 use vortex_dtype::{match_each_integer_ptype, Nullability};
 use vortex_error::VortexResult;
 use vortex_expr::Operator;
@@ -136,7 +136,7 @@ impl CompareFn for ByteBoolArray {
 impl FillForwardFn for ByteBoolArray {
     fn fill_forward(&self) -> VortexResult<Array> {
         if self.dtype().nullability() == Nullability::NonNullable {
-            return Ok(self.to_array_data().into_array());
+            return Ok(self.clone().into());
         }
 
         let validity = self.logical_validity().to_null_buffer()?.unwrap();
diff --git a/encodings/byte-bool/src/lib.rs b/encodings/byte-bool/src/lib.rs
index 63a1cebc01..05e6c6e8b2 100644
--- a/encodings/byte-bool/src/lib.rs
+++ b/encodings/byte-bool/src/lib.rs
@@ -3,7 +3,7 @@ use std::mem::ManuallyDrop;
 
 use arrow_buffer::BooleanBuffer;
 use serde::{Deserialize, Serialize};
-use vortex::array::bool::BoolArray;
+use vortex::array::BoolArray;
 use vortex::stats::StatsSet;
 use vortex::validity::{ArrayValidity, LogicalValidity, Validity, ValidityMetadata};
 use vortex::variants::{ArrayVariants, BoolArrayTrait};
diff --git a/encodings/datetime-parts/src/compress.rs b/encodings/datetime-parts/src/compress.rs
index d06b4c7b7e..d582624ec2 100644
--- a/encodings/datetime-parts/src/compress.rs
+++ b/encodings/datetime-parts/src/compress.rs
@@ -1,5 +1,4 @@
-use vortex::array::datetime::{TemporalArray, TimeUnit};
-use vortex::array::primitive::PrimitiveArray;
+use vortex::array::{PrimitiveArray, TemporalArray, TimeUnit};
 use vortex::compute::unary::try_cast;
 use vortex::{Array, IntoArray, IntoArrayVariant};
 use vortex_dtype::PType;
diff --git a/encodings/datetime-parts/src/compute.rs b/encodings/datetime-parts/src/compute.rs
index ad5a8d2153..48ce586527 100644
--- a/encodings/datetime-parts/src/compute.rs
+++ b/encodings/datetime-parts/src/compute.rs
@@ -1,6 +1,5 @@
-use vortex::array::datetime::temporal::TemporalMetadata;
-use vortex::array::datetime::{TemporalArray, TimeUnit};
-use vortex::array::primitive::PrimitiveArray;
+use vortex::array::temporal::TemporalMetadata;
+use vortex::array::{PrimitiveArray, TemporalArray, TimeUnit};
 use vortex::compute::unary::{scalar_at, ScalarAtFn};
 use vortex::compute::{slice, take, ArrayCompute, SliceFn, TakeFn};
 use vortex::validity::ArrayValidity;
@@ -120,8 +119,7 @@ pub fn decode_to_temporal(array: &DateTimePartsArray) -> VortexResult<TemporalAr
 
 #[cfg(test)]
 mod test {
-    use vortex::array::datetime::{TemporalArray, TimeUnit};
-    use vortex::array::primitive::PrimitiveArray;
+    use vortex::array::{PrimitiveArray, TemporalArray, TimeUnit};
     use vortex::{IntoArray, IntoArrayVariant};
     use vortex_dtype::{DType, Nullability};
 
diff --git a/encodings/dict/benches/dict_compress.rs b/encodings/dict/benches/dict_compress.rs
index 3b82307c19..bb3286e125 100644
--- a/encodings/dict/benches/dict_compress.rs
+++ b/encodings/dict/benches/dict_compress.rs
@@ -2,8 +2,7 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use rand::distributions::{Alphanumeric, Uniform};
 use rand::prelude::SliceRandom;
 use rand::{thread_rng, Rng};
-use vortex::array::primitive::PrimitiveArray;
-use vortex::array::varbin::VarBinArray;
+use vortex::array::{PrimitiveArray, VarBinArray};
 use vortex::ArrayTrait;
 use vortex_dict::dict_encode_typed_primitive;
 use vortex_dtype::match_each_native_ptype;
diff --git a/encodings/dict/src/compress.rs b/encodings/dict/src/compress.rs
index 7314f4c7d9..56f2e21173 100644
--- a/encodings/dict/src/compress.rs
+++ b/encodings/dict/src/compress.rs
@@ -5,8 +5,7 @@ use hashbrown::hash_map::{Entry, RawEntryMut};
 use hashbrown::HashMap;
 use num_traits::AsPrimitive;
 use vortex::accessor::ArrayAccessor;
-use vortex::array::primitive::PrimitiveArray;
-use vortex::array::varbin::VarBinArray;
+use vortex::array::{PrimitiveArray, VarBinArray};
 use vortex::validity::Validity;
 use vortex::{ArrayDType, IntoArray};
 use vortex_dtype::{match_each_native_ptype, DType, NativePType, ToBytes};
@@ -175,8 +174,7 @@ mod test {
     use std::str;
 
     use vortex::accessor::ArrayAccessor;
-    use vortex::array::primitive::PrimitiveArray;
-    use vortex::array::varbin::VarBinArray;
+    use vortex::array::{PrimitiveArray, VarBinArray};
     use vortex::compute::unary::scalar_at;
     use vortex::ToArray;
     use vortex_dtype::Nullability::Nullable;
diff --git a/encodings/dict/src/compute.rs b/encodings/dict/src/compute.rs
index d1a503ae9f..a333a2c157 100644
--- a/encodings/dict/src/compute.rs
+++ b/encodings/dict/src/compute.rs
@@ -46,8 +46,7 @@ impl SliceFn for DictArray {
 
 #[cfg(test)]
 mod test {
-    use vortex::array::primitive::PrimitiveArray;
-    use vortex::array::varbin::VarBinArray;
+    use vortex::array::{PrimitiveArray, VarBinArray};
     use vortex::{IntoArray, IntoArrayVariant, ToArray};
     use vortex_dtype::{DType, Nullability};
 
diff --git a/encodings/dict/src/dict.rs b/encodings/dict/src/dict.rs
index 7657d773fc..7cda4a4943 100644
--- a/encodings/dict/src/dict.rs
+++ b/encodings/dict/src/dict.rs
@@ -2,7 +2,7 @@ use std::fmt::Debug;
 
 use serde::{Deserialize, Serialize};
 use vortex::accessor::ArrayAccessor;
-use vortex::array::bool::BoolArray;
+use vortex::array::BoolArray;
 use vortex::compute::take;
 use vortex::compute::unary::scalar_at;
 use vortex::stats::StatsSet;
diff --git a/encodings/fastlanes/benches/bitpacking_take.rs b/encodings/fastlanes/benches/bitpacking_take.rs
index d30b3dedb4..fba3d28c28 100644
--- a/encodings/fastlanes/benches/bitpacking_take.rs
+++ b/encodings/fastlanes/benches/bitpacking_take.rs
@@ -2,8 +2,7 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use itertools::Itertools;
 use rand::distributions::Uniform;
 use rand::{thread_rng, Rng};
-use vortex::array::primitive::PrimitiveArray;
-use vortex::array::sparse::SparseArray;
+use vortex::array::{PrimitiveArray, SparseArray};
 use vortex::compute::take;
 use vortex_fastlanes::{find_best_bit_width, BitPackedArray};
 
diff --git a/encodings/fastlanes/src/bitpacking/compress.rs b/encodings/fastlanes/src/bitpacking/compress.rs
index 0a3f5480bc..4a3689487f 100644
--- a/encodings/fastlanes/src/bitpacking/compress.rs
+++ b/encodings/fastlanes/src/bitpacking/compress.rs
@@ -1,8 +1,7 @@
 use std::mem::size_of;
 
 use fastlanes::BitPacking;
-use vortex::array::primitive::PrimitiveArray;
-use vortex::array::sparse::{Sparse, SparseArray};
+use vortex::array::{PrimitiveArray, Sparse, SparseArray};
 use vortex::stats::ArrayStatistics;
 use vortex::validity::Validity;
 use vortex::{Array, ArrayDType, ArrayDef, IntoArray, IntoArrayVariant};
diff --git a/encodings/fastlanes/src/bitpacking/compute/search_sorted.rs b/encodings/fastlanes/src/bitpacking/compute/search_sorted.rs
index 77592deea8..e287f83a60 100644
--- a/encodings/fastlanes/src/bitpacking/compute/search_sorted.rs
+++ b/encodings/fastlanes/src/bitpacking/compute/search_sorted.rs
@@ -2,8 +2,7 @@ use std::cmp::Ordering;
 use std::cmp::Ordering::Greater;
 
 use fastlanes::BitPacking;
-use vortex::array::primitive::PrimitiveArray;
-use vortex::array::sparse::SparseArray;
+use vortex::array::{PrimitiveArray, SparseArray};
 use vortex::compute::{
     search_sorted, IndexOrd, Len, SearchResult, SearchSorted, SearchSortedFn, SearchSortedSide,
 };
@@ -85,7 +84,7 @@ impl Len for BitPackedSearch {
 
 #[cfg(test)]
 mod test {
-    use vortex::array::primitive::PrimitiveArray;
+    use vortex::array::PrimitiveArray;
     use vortex::compute::{search_sorted, slice, SearchResult, SearchSortedSide};
     use vortex::IntoArray;
 
diff --git a/encodings/fastlanes/src/bitpacking/compute/slice.rs b/encodings/fastlanes/src/bitpacking/compute/slice.rs
index 55c31b6405..fdb11e62b9 100644
--- a/encodings/fastlanes/src/bitpacking/compute/slice.rs
+++ b/encodings/fastlanes/src/bitpacking/compute/slice.rs
@@ -28,7 +28,7 @@ impl SliceFn for BitPackedArray {
 
 #[cfg(test)]
 mod test {
-    use vortex::array::primitive::PrimitiveArray;
+    use vortex::array::PrimitiveArray;
     use vortex::compute::slice;
     use vortex::compute::unary::scalar_at;
     use vortex::IntoArray;
diff --git a/encodings/fastlanes/src/bitpacking/compute/take.rs b/encodings/fastlanes/src/bitpacking/compute/take.rs
index ff355b662d..03b4c77a8d 100644
--- a/encodings/fastlanes/src/bitpacking/compute/take.rs
+++ b/encodings/fastlanes/src/bitpacking/compute/take.rs
@@ -2,9 +2,7 @@ use std::cmp::min;
 
 use fastlanes::BitPacking;
 use itertools::Itertools;
-use vortex::array::constant::ConstantArray;
-use vortex::array::primitive::PrimitiveArray;
-use vortex::array::sparse::SparseArray;
+use vortex::array::{ConstantArray, PrimitiveArray, SparseArray};
 use vortex::compute::{slice, take, TakeFn};
 use vortex::{Array, ArrayDType, IntoArray, IntoArrayVariant};
 use vortex_dtype::{
@@ -146,8 +144,7 @@ mod test {
     use itertools::Itertools;
     use rand::distributions::Uniform;
     use rand::{thread_rng, Rng};
-    use vortex::array::primitive::{Primitive, PrimitiveArray};
-    use vortex::array::sparse::SparseArray;
+    use vortex::array::{Primitive, PrimitiveArray, SparseArray};
     use vortex::compute::take;
     use vortex::compute::unary::scalar_at;
     use vortex::{ArrayDef, IntoArray, IntoArrayVariant};
diff --git a/encodings/fastlanes/src/bitpacking/mod.rs b/encodings/fastlanes/src/bitpacking/mod.rs
index 02f28aa44c..f9658feabc 100644
--- a/encodings/fastlanes/src/bitpacking/mod.rs
+++ b/encodings/fastlanes/src/bitpacking/mod.rs
@@ -1,6 +1,6 @@
 use ::serde::{Deserialize, Serialize};
 pub use compress::*;
-use vortex::array::primitive::{Primitive, PrimitiveArray};
+use vortex::array::{Primitive, PrimitiveArray};
 use vortex::stats::{ArrayStatisticsCompute, StatsSet};
 use vortex::validity::{ArrayValidity, LogicalValidity, Validity, ValidityMetadata};
 use vortex::variants::{ArrayVariants, PrimitiveArrayTrait};
@@ -212,7 +212,7 @@ impl PrimitiveArrayTrait for BitPackedArray {}
 
 #[cfg(test)]
 mod test {
-    use vortex::array::primitive::PrimitiveArray;
+    use vortex::array::PrimitiveArray;
     use vortex::{IntoArray, IntoArrayVariant};
 
     use crate::BitPackedArray;
diff --git a/encodings/fastlanes/src/delta/compress.rs b/encodings/fastlanes/src/delta/compress.rs
index 5f9c3ffdac..34f2c5f0d1 100644
--- a/encodings/fastlanes/src/delta/compress.rs
+++ b/encodings/fastlanes/src/delta/compress.rs
@@ -1,7 +1,7 @@
 use arrayref::{array_mut_ref, array_ref};
 use fastlanes::{Delta, Transpose};
 use num_traits::{WrappingAdd, WrappingSub};
-use vortex::array::primitive::PrimitiveArray;
+use vortex::array::PrimitiveArray;
 use vortex::compute::unary::fill_forward;
 use vortex::validity::Validity;
 use vortex::IntoArrayVariant;
diff --git a/encodings/fastlanes/src/for/compress.rs b/encodings/fastlanes/src/for/compress.rs
index 3dc789f000..1b49e32cde 100644
--- a/encodings/fastlanes/src/for/compress.rs
+++ b/encodings/fastlanes/src/for/compress.rs
@@ -1,7 +1,6 @@
 use itertools::Itertools;
 use num_traits::{PrimInt, WrappingAdd, WrappingSub};
-use vortex::array::constant::ConstantArray;
-use vortex::array::primitive::PrimitiveArray;
+use vortex::array::{ConstantArray, PrimitiveArray};
 use vortex::stats::{trailing_zeros, ArrayStatistics, Stat};
 use vortex::{Array, ArrayDType, IntoArray, IntoArrayVariant};
 use vortex_dtype::{match_each_integer_ptype, NativePType};
diff --git a/encodings/fastlanes/src/for/compute.rs b/encodings/fastlanes/src/for/compute.rs
index 85c784f5bb..6b146b3f50 100644
--- a/encodings/fastlanes/src/for/compute.rs
+++ b/encodings/fastlanes/src/for/compute.rs
@@ -93,7 +93,7 @@ impl SearchSortedFn for FoRArray {
 
 #[cfg(test)]
 mod test {
-    use vortex::array::primitive::PrimitiveArray;
+    use vortex::array::PrimitiveArray;
     use vortex::compute::unary::scalar_at;
     use vortex::compute::{search_sorted, SearchResult, SearchSortedSide};
     use vortex::IntoArray;
diff --git a/encodings/roaring/src/boolean/compress.rs b/encodings/roaring/src/boolean/compress.rs
index 1bf1f4acb6..b2a6b4d75e 100644
--- a/encodings/roaring/src/boolean/compress.rs
+++ b/encodings/roaring/src/boolean/compress.rs
@@ -1,5 +1,5 @@
 use croaring::Bitmap;
-use vortex::array::bool::BoolArray;
+use vortex::array::BoolArray;
 use vortex_error::VortexResult;
 
 use crate::RoaringBoolArray;
diff --git a/encodings/roaring/src/boolean/mod.rs b/encodings/roaring/src/boolean/mod.rs
index c1de70d176..675eade8bb 100644
--- a/encodings/roaring/src/boolean/mod.rs
+++ b/encodings/roaring/src/boolean/mod.rs
@@ -4,7 +4,7 @@ use arrow_buffer::{BooleanBuffer, Buffer as ArrowBuffer};
 pub use compress::*;
 pub use croaring::{Bitmap, Portable};
 use serde::{Deserialize, Serialize};
-use vortex::array::bool::{Bool, BoolArray};
+use vortex::array::{Bool, BoolArray};
 use vortex::stats::{ArrayStatisticsCompute, StatsSet};
 use vortex::validity::{ArrayValidity, LogicalValidity, Validity};
 use vortex::variants::{ArrayVariants, BoolArrayTrait};
@@ -128,7 +128,7 @@ impl IntoCanonical for RoaringBoolArray {
 
 #[cfg(test)]
 mod test {
-    use vortex::array::bool::BoolArray;
+    use vortex::array::BoolArray;
     use vortex::compute::unary::scalar_at;
     use vortex::IntoArray;
     use vortex_error::VortexResult;
diff --git a/encodings/roaring/src/integer/compress.rs b/encodings/roaring/src/integer/compress.rs
index 4d01a1f6db..37f87e0836 100644
--- a/encodings/roaring/src/integer/compress.rs
+++ b/encodings/roaring/src/integer/compress.rs
@@ -1,6 +1,6 @@
 use croaring::Bitmap;
 use num_traits::NumCast;
-use vortex::array::primitive::PrimitiveArray;
+use vortex::array::PrimitiveArray;
 use vortex_dtype::{NativePType, PType};
 use vortex_error::VortexResult;
 
diff --git a/encodings/roaring/src/integer/mod.rs b/encodings/roaring/src/integer/mod.rs
index 799625efa3..4704760464 100644
--- a/encodings/roaring/src/integer/mod.rs
+++ b/encodings/roaring/src/integer/mod.rs
@@ -3,7 +3,7 @@ use std::fmt::Debug;
 pub use compress::*;
 use croaring::{Bitmap, Portable};
 use serde::{Deserialize, Serialize};
-use vortex::array::primitive::{Primitive, PrimitiveArray};
+use vortex::array::{Primitive, PrimitiveArray};
 use vortex::stats::{ArrayStatisticsCompute, StatsSet};
 use vortex::validity::{ArrayValidity, LogicalValidity};
 use vortex::variants::{ArrayVariants, PrimitiveArrayTrait};
@@ -103,7 +103,7 @@ impl ArrayStatisticsCompute for RoaringIntArray {}
 
 #[cfg(test)]
 mod test {
-    use vortex::array::primitive::PrimitiveArray;
+    use vortex::array::PrimitiveArray;
     use vortex::compute::unary::scalar_at;
     use vortex::IntoArray;
     use vortex_error::VortexResult;
diff --git a/encodings/runend-bool/src/array.rs b/encodings/runend-bool/src/array.rs
index 82a360e184..6ca3019bd9 100644
--- a/encodings/runend-bool/src/array.rs
+++ b/encodings/runend-bool/src/array.rs
@@ -151,7 +151,7 @@ impl ArrayStatisticsCompute for RunEndBoolArray {}
 
 #[cfg(test)]
 mod test {
-    use vortex::array::bool::BoolArray;
+    use vortex::array::BoolArray;
     use vortex::compute::unary::scalar_at;
     use vortex::compute::{slice, take};
     use vortex::validity::Validity;
diff --git a/encodings/runend-bool/src/compress.rs b/encodings/runend-bool/src/compress.rs
index d7f7cbf631..f98e2ec7c5 100644
--- a/encodings/runend-bool/src/compress.rs
+++ b/encodings/runend-bool/src/compress.rs
@@ -2,8 +2,7 @@ use std::cmp::min;
 
 use arrow_buffer::buffer::BooleanBuffer;
 use num_traits::{AsPrimitive, FromPrimitive};
-use vortex::array::bool::BoolArray;
-use vortex::array::primitive::PrimitiveArray;
+use vortex::array::{BoolArray, PrimitiveArray};
 use vortex::validity::Validity;
 use vortex_dtype::{match_each_integer_ptype, NativePType};
 use vortex_error::VortexResult;
@@ -84,7 +83,7 @@ mod test {
     use itertools::Itertools;
     use rand::prelude::StdRng;
     use rand::{Rng, SeedableRng};
-    use vortex::array::bool::BoolArray;
+    use vortex::array::BoolArray;
     use vortex::compute::SliceFn;
     use vortex::validity::Validity;
     use vortex::IntoArrayVariant;
diff --git a/encodings/runend-bool/src/compute.rs b/encodings/runend-bool/src/compute.rs
index 1a79777866..a42d3b913a 100644
--- a/encodings/runend-bool/src/compute.rs
+++ b/encodings/runend-bool/src/compute.rs
@@ -1,4 +1,4 @@
-use vortex::array::bool::BoolArray;
+use vortex::array::BoolArray;
 use vortex::compute::unary::ScalarAtFn;
 use vortex::compute::{slice, ArrayCompute, SliceFn, TakeFn};
 use vortex::{Array, IntoArray, IntoArrayVariant, ToArray};
diff --git a/encodings/runend/src/compress.rs b/encodings/runend/src/compress.rs
index 4e35ceae83..ce5a70d590 100644
--- a/encodings/runend/src/compress.rs
+++ b/encodings/runend/src/compress.rs
@@ -2,7 +2,7 @@ use std::cmp::min;
 
 use itertools::Itertools;
 use num_traits::{AsPrimitive, FromPrimitive};
-use vortex::array::primitive::PrimitiveArray;
+use vortex::array::PrimitiveArray;
 use vortex::stats::{ArrayStatistics, Stat};
 use vortex::validity::Validity;
 use vortex::ArrayDType;
@@ -108,7 +108,7 @@ pub fn runend_decode_primitive<
 
 #[cfg(test)]
 mod test {
-    use vortex::array::primitive::PrimitiveArray;
+    use vortex::array::PrimitiveArray;
     use vortex::validity::{ArrayValidity, Validity};
     use vortex::IntoArray;
 
diff --git a/encodings/runend/src/compute.rs b/encodings/runend/src/compute.rs
index f41f3d9aab..0122965066 100644
--- a/encodings/runend/src/compute.rs
+++ b/encodings/runend/src/compute.rs
@@ -1,4 +1,4 @@
-use vortex::array::primitive::PrimitiveArray;
+use vortex::array::PrimitiveArray;
 use vortex::compute::unary::{scalar_at, ScalarAtFn};
 use vortex::compute::{slice, take, ArrayCompute, SliceFn, TakeFn};
 use vortex::{Array, IntoArray, IntoArrayVariant};
@@ -65,7 +65,7 @@ impl SliceFn for RunEndArray {
 
 #[cfg(test)]
 mod test {
-    use vortex::array::primitive::PrimitiveArray;
+    use vortex::array::PrimitiveArray;
     use vortex::compute::take;
     use vortex::{IntoArrayVariant, ToArray};
 
diff --git a/encodings/runend/src/runend.rs b/encodings/runend/src/runend.rs
index 4d19e6c036..5745aa6cc1 100644
--- a/encodings/runend/src/runend.rs
+++ b/encodings/runend/src/runend.rs
@@ -1,7 +1,7 @@
 use std::fmt::Debug;
 
 use serde::{Deserialize, Serialize};
-use vortex::array::primitive::{Primitive, PrimitiveArray};
+use vortex::array::{Primitive, PrimitiveArray};
 use vortex::compute::unary::scalar_at;
 use vortex::compute::{search_sorted, SearchSortedSide};
 use vortex::stats::{ArrayStatistics, ArrayStatisticsCompute, StatsSet};
diff --git a/encodings/zigzag/src/compress.rs b/encodings/zigzag/src/compress.rs
index 213a178290..1394971c2d 100644
--- a/encodings/zigzag/src/compress.rs
+++ b/encodings/zigzag/src/compress.rs
@@ -1,4 +1,4 @@
-use vortex::array::primitive::PrimitiveArray;
+use vortex::array::PrimitiveArray;
 use vortex::validity::Validity;
 use vortex::IntoArray;
 use vortex_dtype::{NativePType, PType};
diff --git a/encodings/zigzag/src/zigzag.rs b/encodings/zigzag/src/zigzag.rs
index 00b55ea446..eb067611d0 100644
--- a/encodings/zigzag/src/zigzag.rs
+++ b/encodings/zigzag/src/zigzag.rs
@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use vortex::array::primitive::PrimitiveArray;
+use vortex::array::PrimitiveArray;
 use vortex::stats::{ArrayStatisticsCompute, StatsSet};
 use vortex::validity::{ArrayValidity, LogicalValidity};
 use vortex::variants::{ArrayVariants, PrimitiveArrayTrait};