Move PType into vortex-dtype

spiraldb · Apr 29, 2024 · a834c43 · a834c43
1 parent 8feb313
commit a834c43
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/vortex-array/Cargo.toml b/vortex-array/Cargo.toml
@@ -25,7 +25,6 @@ arrow-buffer = { workspace = true }
 arrow-schema = { workspace = true }
 flatbuffers = { workspace = true }
 flexbuffers = { workspace = true }
-half = { workspace = true }
 humansize = { workspace = true }
 itertools = { workspace = true }
 leb128 = { workspace = true }

diff --git a/vortex-array/src/scalar/mod.rs b/vortex-array/src/scalar/mod.rs
@@ -3,12 +3,12 @@ use std::fmt::{Debug, Display, Formatter};
 pub use binary::*;
 pub use bool::*;
 pub use composite::*;
-use half::f16;
 pub use list::*;
 pub use null::*;
 pub use primitive::*;
 pub use struct_::*;
 pub use utf8::*;
+use vortex_dtype::half::f16;
 use vortex_dtype::NativePType;
 use vortex_dtype::{DType, FloatWidth, IntWidth, Nullability, Signedness};
 use vortex_error::VortexResult;

diff --git a/vortex-array/src/scalar/primitive.rs b/vortex-array/src/scalar/primitive.rs
@@ -2,7 +2,7 @@ use std::any;
 use std::fmt::{Display, Formatter};
 use std::mem::size_of;
 
-use half::f16;
+use vortex_dtype::half::f16;
 use vortex_dtype::{match_each_integer_ptype, match_each_native_ptype};
 use vortex_dtype::{DType, Nullability};
 use vortex_dtype::{NativePType, PType};

diff --git a/vortex-dict/Cargo.toml b/vortex-dict/Cargo.toml
@@ -13,7 +13,6 @@ rust-version = { workspace = true }
 
 [dependencies]
 ahash = { workspace = true }
-half = { workspace = true }
 hashbrown = { workspace = true }
 linkme = { workspace = true }
 log = { workspace = true }

diff --git a/vortex-dtype/Cargo.toml b/vortex-dtype/Cargo.toml
@@ -15,12 +15,7 @@ rust-version = { workspace = true }
 name = "vortex_dtype"
 path = "src/lib.rs"
 
-[features]
-arrow = ["arrow-buffer", "arrow-schema"]
-
 [dependencies]
-arrow-buffer = { workspace = true, optional = true }
-arrow-schema = { workspace = true, optional = true }
 flatbuffers = { workspace = true }
 half = { workspace = true }
 itertools = { workspace = true }