fix lint errors

hasura · Feb 10, 2025 · ec90d44 · ec90d44
1 parent 2157b43
commit ec90d44
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 22 deletions.
diff --git a/ndc-test/src/client/mod.rs b/ndc-test/src/client/mod.rs
@@ -52,9 +52,12 @@ impl fmt::Display for Error {
         let (module, e) = match self {
             Error::Reqwest(e) => ("reqwest", e.to_string()),
             Error::Serde(e) => ("serde", e.to_string()),
-            Error::SerdeWithMessage(e, message) => ("serde", format!("{}: {}", message, e)),
+            Error::SerdeWithMessage(e, message) => ("serde", format!("{message}: {e}")),
             Error::Io(e) => ("IO", e.to_string()),
-            Error::ConnectorError(e) => ("response", format!("status code {} error {}", e.status, e.raw_response.to_string())),
+            Error::ConnectorError(e) => (
+                "response",
+                format!("status code {} error {}", e.status, e.raw_response),
+            ),
             Error::InvalidConnectorError(e) => ("response", format!("status code {}", e.status)),
             Error::InvalidBaseURL => ("url", "invalid base URL".into()),
         };
@@ -66,8 +69,7 @@ impl error::Error for Error {
     fn source(&self) -> Option<&(dyn error::Error + 'static)> {
         match self {
             Error::Reqwest(e) => Some(e),
-            Error::Serde(e) => Some(e),
-            Error::SerdeWithMessage(e, _) => Some(e),
+            Error::Serde(e) | Error::SerdeWithMessage(e, _) => Some(e),
             Error::Io(e) => Some(e),
             Error::ConnectorError(_) | Error::InvalidConnectorError(_) | Error::InvalidBaseURL => {
                 None
@@ -220,7 +222,7 @@ fn construct_error(
             Error::ConnectorError(connector_error)
         }
         Err(e) => {
-            let message = format!("failed to deserialize error response: {}", e);
+            let message = format!("failed to deserialize error response: {e}");
             Error::SerdeWithMessage(e, message)
         }
     }

diff --git a/ndc-test/src/error.rs b/ndc-test/src/error.rs
@@ -5,9 +5,9 @@ pub type OtherError = Box<dyn std::error::Error + Send + Sync>;
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
     #[error("error communicating with the connector: {0}")]
-    CommunicationError(#[from] super::client::Error),
+    CommunicationError(#[from] Box<super::client::Error>),
     #[error("error communicating with the connector: {0} ")]
-    CommunicationErrorWithContent(super::client::Error),
+    CommunicationErrorWithContent(Box<super::client::Error>),
     #[error("error generating test data: {0}")]
     StrategyError(#[from] rand::Error),
     #[error("error parsing semver range: {0}")]

diff --git a/ndc-test/src/lib.rs b/ndc-test/src/lib.rs
@@ -36,19 +36,23 @@ use crate::test_cases::query::validate::ValidatingConnector;
 #[async_trait(?Send)]
 impl Connector for client::Configuration {
     async fn get_capabilities(&self) -> Result<models::CapabilitiesResponse> {
-        Ok(client::capabilities_get(self).await?)
+        Ok(client::capabilities_get(self).await.map_err(Box::new)?)
     }
 
     async fn get_schema(&self) -> Result<models::SchemaResponse> {
-        Ok(client::schema_get(self).await?)
+        Ok(client::schema_get(self).await.map_err(Box::new)?)
     }
 
     async fn query(&self, request: models::QueryRequest) -> Result<models::QueryResponse> {
-        Ok(client::query_post(self, request).await.map_err(Error::CommunicationErrorWithContent)?)
+        Ok(client::query_post(self, request)
+            .await
+            .map_err(|e| Error::CommunicationErrorWithContent(Box::new(e)))?)
     }
 
     async fn mutation(&self, request: models::MutationRequest) -> Result<models::MutationResponse> {
-        Ok(client::mutation_post(self, request).await?)
+        Ok(client::mutation_post(self, request)
+            .await
+            .map_err(Box::new)?)
     }
 }
 
@@ -164,13 +168,9 @@ pub async fn test_snapshots_in_directory_with<
 
                             match response {
                                 Ok(response) => snapshot_test(snapshot_path, &response),
-                                Err(e) => {
-                                    Err(e)
-                                }
+                                Err(e) => Err(e),
                             }
 
-
-
                             // snapshot_test(snapshot_path, &response)
                         }
                     }

diff --git a/ndc-test/src/snapshot.rs b/ndc-test/src/snapshot.rs
@@ -66,19 +66,16 @@ where
     if snapshot_path.exists() {
         let snapshot_file = File::open(snapshot_path).map_err(Error::CannotOpenSnapshotFile)?;
         let snapshot: R = serde_json::from_reader(snapshot_file)?;
-        let compare: pretty_assertions::Comparison<R, R> = pretty_assertions::Comparison::new(&snapshot, expected);
-
-
-
+        let compare: pretty_assertions::Comparison<R, R> =
+            pretty_assertions::Comparison::new(&snapshot, expected);
 
         if snapshot != *expected {
-            println!("Expected: {:?}", expected);
             let actual = serde_json::to_string_pretty(&expected)?;
 
             return Err(Error::ResponseDidNotMatchSnapshot(
                 snapshot_path.to_path_buf(),
                 actual,
-                format!("{}", compare),
+                format!("{compare}"),
             ));
         }
     } else {