From f8bd2e1b4c3335943b545b943ef45eb3cdfea3fd Mon Sep 17 00:00:00 2001 From: "R. Tyler Croy" Date: Fri, 14 Jul 2023 22:20:09 -0700 Subject: [PATCH] Fix the latest clippy warnings with the newer rustc's --- rust/src/action/mod.rs | 4 ++-- rust/src/lib.rs | 2 +- rust/tests/command_filesystem_check.rs | 2 +- rust/tests/integration_object_store.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rust/src/action/mod.rs b/rust/src/action/mod.rs index 5ed387e8dd..b0f446d124 100644 --- a/rust/src/action/mod.rs +++ b/rust/src/action/mod.rs @@ -9,7 +9,7 @@ pub mod parquet2_read; #[cfg(feature = "parquet")] mod parquet_read; -#[cfg(all(feature = "arrow"))] +#[cfg(feature = "arrow")] use arrow_schema::ArrowError; use futures::StreamExt; use lazy_static::lazy_static; @@ -75,7 +75,7 @@ pub enum ProtocolError { }, /// Error returned when converting the schema to Arrow format failed. - #[cfg(all(feature = "arrow"))] + #[cfg(feature = "arrow")] #[error("Failed to convert into Arrow schema: {}", .source)] Arrow { /// Arrow error details returned when converting the schema in Arrow format failed diff --git a/rust/src/lib.rs b/rust/src/lib.rs index 5323c34eff..b2e422213f 100644 --- a/rust/src/lib.rs +++ b/rust/src/lib.rs @@ -95,7 +95,7 @@ pub mod storage; pub mod table_state; pub mod time_utils; -#[cfg(all(feature = "arrow"))] +#[cfg(feature = "arrow")] pub mod table_state_arrow; #[cfg(all(feature = "arrow", feature = "parquet"))] diff --git a/rust/tests/command_filesystem_check.rs b/rust/tests/command_filesystem_check.rs index 1b3fec85fb..ced317d990 100644 --- a/rust/tests/command_filesystem_check.rs +++ b/rust/tests/command_filesystem_check.rs @@ -1,4 +1,4 @@ -#![cfg(all(feature = "integration_test"))] +#![cfg(feature = "integration_test")] use deltalake::test_utils::{ set_env_if_not_set, IntegrationContext, StorageIntegration, TestResult, TestTables, diff --git a/rust/tests/integration_object_store.rs b/rust/tests/integration_object_store.rs index daf702d291..6fd31d759b 100644 --- a/rust/tests/integration_object_store.rs +++ b/rust/tests/integration_object_store.rs @@ -32,7 +32,7 @@ async fn test_object_store_aws() -> TestResult { // TODO pending emulator support in object store crate #[ignore] -#[cfg(all(feature = "gcs"))] +#[cfg(feature = "gcs")] #[tokio::test] #[serial] async fn test_object_store_google() -> TestResult {