chore: clippy + fix deltalake-unity deps

delta-io · Jan 1, 2025 · be76272 · be76272
1 parent bc40d54
commit be76272
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 18 deletions.
diff --git a/crates/aws/src/lib.rs b/crates/aws/src/lib.rs
@@ -78,7 +78,7 @@ impl LogStoreFactory for S3LogStoreFactory {
                 store,
             )?));
         }
-        Ok(default_logstore(store, location, &options))
+        Ok(default_logstore(store, location, options))
     }
 }
 
@@ -141,6 +141,7 @@ impl std::fmt::Debug for DynamoDbLockClient {
 
 impl DynamoDbLockClient {
     /// Creates a new DynamoDbLockClient from the supplied storage options.
+    #[allow(clippy::too_many_arguments)]
     pub fn try_new(
         sdk_config: &SdkConfig,
         lock_table_name: Option<String>,

diff --git a/crates/azure/Cargo.toml b/crates/azure/Cargo.toml
@@ -14,7 +14,7 @@ rust-version.workspace = true
 [dependencies]
 deltalake-core = { version = "0.23.0", path = "../core", features = [
     "datafusion",
-] }
+]}
 lazy_static = "1"
 
 # workspace depenndecies

diff --git a/crates/catalog-unity/Cargo.toml b/crates/catalog-unity/Cargo.toml
@@ -17,17 +17,19 @@ tokio.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 thiserror.workspace = true
-deltalake-core = { version = "0.23", path = "../core" }
+deltalake-core = { version = "0.23", path = "../core", features = [
+    "datafusion",
+]}
 reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "json", "http2"] }
 reqwest-retry = "0.7"
 reqwest-middleware = "0.4.0"
 rand = "0.8"
-futures = "0.3"
-chrono = "0.4"
+futures = { workspace = true }
+chrono = { workspace = true }
 dashmap = "6"
-tracing = "0.1"
-datafusion = { version = "43", optional = true }
-datafusion-common = { version = "43", optional = true }
+tracing = { workspace = true }
+datafusion = { workspace = true, optional = true }
+datafusion-common = { workspace = true, optional = true }
 
 [dev-dependencies]
 tokio = { version = "1", features = ["macros", "rt-multi-thread"] }

diff --git a/crates/catalog-unity/src/credential.rs b/crates/catalog-unity/src/credential.rs
@@ -205,8 +205,7 @@ impl TokenCredential for AzureCliCredential {
                             "got unexpected token type from azure cli: {0}",
                             token_response.token_type
                         ),
-                    }
-                    .into());
+                    });
                 }
                 let duration =
                     token_response.expires_on.naive_local() - chrono::Local::now().naive_local();
@@ -224,18 +223,15 @@ impl TokenCredential for AzureCliCredential {
                 let message = String::from_utf8_lossy(&az_output.stderr);
                 Err(UnityCatalogError::AzureCli {
                     message: message.into(),
-                }
-                .into())
+                })
             }
             Err(e) => match e.kind() {
                 std::io::ErrorKind::NotFound => Err(UnityCatalogError::AzureCli {
                     message: "Azure Cli not installed".into(),
-                }
-                .into()),
+                }),
                 error_kind => Err(UnityCatalogError::AzureCli {
                     message: format!("io error: {error_kind:?}"),
-                }
-                .into()),
+                }),
             },
         }
     }

diff --git a/crates/catalog-unity/src/lib.rs b/crates/catalog-unity/src/lib.rs
@@ -644,8 +644,7 @@ impl DataCatalog for UnityCatalog {
             GetTableResponse::Error(err) => Err(UnityCatalogError::InvalidTable {
                 error_code: err.error_code,
                 message: err.message,
-            }
-            .into()),
+            }),
         }
     }
 }

diff --git a/python/src/lib.rs b/python/src/lib.rs
@@ -670,6 +670,7 @@ impl RawDeltaTable {
     }
 
     #[pyo3(signature = (starting_version = 0, ending_version = None, starting_timestamp = None, ending_timestamp = None, columns = None, allow_out_of_range = false))]
+    #[allow(clippy::too_many_arguments)]
     pub fn load_cdf(
         &mut self,
         py: Python,