From ec98297a8a0c717049a0b5dd4e16b0c2181630b1 Mon Sep 17 00:00:00 2001
From: Andre Bandarra <andreban@gmail.com>
Date: Wed, 1 May 2024 17:16:04 +0100
Subject: [PATCH] Run cargo clippy --fix

---
 src/client.rs                 | 9 ++++-----
 src/error.rs                  | 2 +-
 src/types/generate_content.rs | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/client.rs b/src/client.rs
index 055df52..aace80f 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -52,7 +52,7 @@ impl<T: TokenProvider + Clone> GeminiClient<T> {
         let access_token = match self.token_provider.get_token(AUTH_SCOPE).await {
             Ok(access_token) => access_token,
             Err(e) => {
-                queue.push(Some(Err(e.into())));
+                queue.push(Some(Err(e)));
                 return queue;
             }
         };
@@ -60,7 +60,7 @@ impl<T: TokenProvider + Clone> GeminiClient<T> {
         // Clone the queue and other necessary data to move into the async block.
         let cloned_queue = queue.clone();
         let endpoint_url: String = format!(
-            "https://{}/v1beta1/projects/{}/locations/{}/publishers/google/models/{}:streamGenerateContent?alt=sse", self.api_endpoint, self.project_id, self.location_id, model.to_string(),
+            "https://{}/v1beta1/projects/{}/locations/{}/publishers/google/models/{}:streamGenerateContent?alt=sse", self.api_endpoint, self.project_id, self.location_id, model,
         );
         let client = self.client.clone();
         let request = request.clone();
@@ -112,7 +112,7 @@ impl<T: TokenProvider + Clone> GeminiClient<T> {
     ) -> Result<GenerateContentResponseResult> {
         let access_token = self.token_provider.get_token(AUTH_SCOPE).await?;
         let endpoint_url: String = format!(
-            "https://{}/v1beta1/projects/{}/locations/{}/publishers/google/models/{}:generateContent", self.api_endpoint, self.project_id, self.location_id, model.to_string(),
+            "https://{}/v1beta1/projects/{}/locations/{}/publishers/google/models/{}:generateContent", self.api_endpoint, self.project_id, self.location_id, model,
         );
         let resp = self
             .client
@@ -189,8 +189,7 @@ impl<T: TokenProvider + Clone> GeminiClient<T> {
         response
             .candidates
             .iter()
-            .map(Candidate::get_text)
-            .flatten()
+            .filter_map(Candidate::get_text)
             .collect::<Vec<String>>()
     }
 
diff --git a/src/error.rs b/src/error.rs
index e524c3c..2a60e87 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -25,7 +25,7 @@ impl Display for Error {
             Error::Token(e) => write!(f, "Token error: {}", e),
             Error::Serde(e) => write!(f, "Serde error: {}", e),
             Error::VertexError(e) => {
-                write!(f, "Vertex error: {}", e.to_string())
+                write!(f, "Vertex error: {}", e)
             }
             Error::NoCandidatesError => {
                 write!(f, "No candidates returned for the prompt")
diff --git a/src/types/generate_content.rs b/src/types/generate_content.rs
index a46d9ec..a90a7ea 100644
--- a/src/types/generate_content.rs
+++ b/src/types/generate_content.rs
@@ -123,9 +123,9 @@ pub enum GenerateContentResponse {
     Error(GenerateContentResponseError),
 }
 
-impl Into<Result<GenerateContentResponseResult>> for GenerateContentResponse {
-    fn into(self) -> Result<GenerateContentResponseResult> {
-        match self {
+impl From<GenerateContentResponse> for Result<GenerateContentResponseResult> {
+    fn from(val: GenerateContentResponse) -> Self {
+        match val {
             GenerateContentResponse::Ok(result) => Ok(result),
             GenerateContentResponse::Error(error) => Err(error.error.into()),
         }