This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new 193955e0ec Produce clear error message when build runs with
conflicting features (#11895)
193955e0ec is described below
commit 193955e0ec4057ab9fc1747ed78b21ddc71a7e25
Author: Piotr Findeisen <[email protected]>
AuthorDate: Thu Aug 8 22:38:05 2024 +0200
Produce clear error message when build runs with conflicting features
(#11895)
Throw explicit error message when `cargo build` is invoked with
conflicting features, e.g. `cargo test --lib --tests --bins
--all-features`.
---
benchmarks/src/bin/dfbench.rs | 5 +++++
benchmarks/src/bin/tpch.rs | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/benchmarks/src/bin/dfbench.rs b/benchmarks/src/bin/dfbench.rs
index 441b6cdc02..9ce6848a06 100644
--- a/benchmarks/src/bin/dfbench.rs
+++ b/benchmarks/src/bin/dfbench.rs
@@ -20,6 +20,11 @@ use datafusion::error::Result;
use structopt::StructOpt;
+#[cfg(all(feature = "snmalloc", feature = "mimalloc"))]
+compile_error!(
+ "feature \"snmalloc\" and feature \"mimalloc\" cannot be enabled at the
same time"
+);
+
#[cfg(feature = "snmalloc")]
#[global_allocator]
static ALLOC: snmalloc_rs::SnMalloc = snmalloc_rs::SnMalloc;
diff --git a/benchmarks/src/bin/tpch.rs b/benchmarks/src/bin/tpch.rs
index fc0f4ca061..3270b082cf 100644
--- a/benchmarks/src/bin/tpch.rs
+++ b/benchmarks/src/bin/tpch.rs
@@ -21,6 +21,11 @@ use datafusion::error::Result;
use datafusion_benchmarks::tpch;
use structopt::StructOpt;
+#[cfg(all(feature = "snmalloc", feature = "mimalloc"))]
+compile_error!(
+ "feature \"snmalloc\" and feature \"mimalloc\" cannot be enabled at the
same time"
+);
+
#[cfg(feature = "snmalloc")]
#[global_allocator]
static ALLOC: snmalloc_rs::SnMalloc = snmalloc_rs::SnMalloc;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
