Skip to content

Commit

Permalink
fix namespace clash with daft-core
Browse files Browse the repository at this point in the history
  • Loading branch information
samster25 committed Jun 22, 2023
1 parent 552b84c commit 59ac639
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/daft-core/src/array/ops/repr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use crate::{
ImageFormat, ListArray, NullArray, StructArray, Utf8Array,
},
};
use common_error::{DaftError, DaftResult};
use common_error::DaftResult;

use super::image::AsImageObj;

Expand Down
27 changes: 27 additions & 0 deletions src/daft-core/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1 +1,28 @@
#![feature(hash_raw_entry)]
#![feature(async_closure)]
#[macro_use]
extern crate lazy_static;

mod array;
mod datatypes;
mod dsl;
#[cfg(feature = "python")]
mod ffi;
mod io;
mod kernels;
#[cfg(feature = "python")]
pub mod python;
mod schema;
mod series;
mod table;
mod utils;

pub const VERSION: &str = env!("CARGO_PKG_VERSION");
pub const BUILD_TYPE_DEV: &str = "dev";
pub const DAFT_BUILD_TYPE: &str = {
let env_build_type: Option<&str> = option_env!("RUST_DAFT_PKG_BUILD_TYPE");
match env_build_type {
Some(val) => val,
None => BUILD_TYPE_DEV,
}
};

0 comments on commit 59ac639

Please sign in to comment.