From 59699ed622ce18ad1db724746d13bc531d8af5c1 Mon Sep 17 00:00:00 2001
From: 0xZensh <txr1883@gmail.com>
Date: Fri, 6 Oct 2023 19:11:10 +0800
Subject: [PATCH] fix: fix some warning

---
 Cargo.lock                     | 2 +-
 Cargo.toml                     | 2 +-
 src/api/embedding.rs           | 2 +-
 src/api/message_translating.rs | 2 +-
 src/api/summarizing.rs         | 2 +-
 src/api/translating.rs         | 6 +++---
 src/db/scylladb.rs             | 9 ++++-----
 7 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 796b9bb..1dfdcd7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1325,7 +1325,7 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "jarvis"
-version = "1.1.0"
+version = "1.1.1"
 dependencies = [
  "anyhow",
  "async-openai",
diff --git a/Cargo.toml b/Cargo.toml
index b994076..31b3019 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jarvis"
-version = "1.1.0"
+version = "1.1.1"
 edition = "2021"
 rust-version = "1.64"
 description = ""
diff --git a/src/api/embedding.rs b/src/api/embedding.rs
index dd474be..007b296 100644
--- a/src/api/embedding.rs
+++ b/src/api/embedding.rs
@@ -56,7 +56,7 @@ pub async fn search(
         return Ok(to.with(SuccessResponse::new(vec![])));
     }
 
-    let rctx = ctx.as_ref().clone();
+    let rctx = ctx.as_ref();
     let embedding_res = app
         .ai
         .embedding(rctx, &vec![q.clone()])
diff --git a/src/api/message_translating.rs b/src/api/message_translating.rs
index ca85a2f..eba79dd 100644
--- a/src/api/message_translating.rs
+++ b/src/api/message_translating.rs
@@ -203,7 +203,7 @@ async fn translate(
         mpsc::channel::<(usize, ReqContext, Result<(u32, TEContentList), HTTPError>)>(pieces);
     for (i, unit) in content.into_iter().enumerate() {
         let rid = rid.clone();
-        let user = user;
+        let user = user.clone();
         let app = app.clone();
         let origin = origin_language.to_name();
         let lang = te.language.to_name();
diff --git a/src/api/summarizing.rs b/src/api/summarizing.rs
index 70063e4..c2eb09b 100644
--- a/src/api/summarizing.rs
+++ b/src/api/summarizing.rs
@@ -206,7 +206,7 @@ async fn summarize(app: Arc<AppState>, rid: String, user: xid::Id, te: TEParams)
 
         for (i, text) in content.into_iter().enumerate() {
             let rid = rid.clone();
-            let user = user;
+            let user = user.clone();
             let app = app.clone();
             let lang = te.language.to_name();
             let tx = tx.clone();
diff --git a/src/api/translating.rs b/src/api/translating.rs
index 4a76465..2a5d636 100644
--- a/src/api/translating.rs
+++ b/src/api/translating.rs
@@ -316,7 +316,7 @@ async fn translate(
         mpsc::channel::<(usize, ReqContext, Result<(u32, TEContentList), HTTPError>)>(pieces);
     for (i, unit) in content.into_iter().enumerate() {
         let rid = rid.clone();
-        let user = user;
+        let user = user.clone();
         let app = app.clone();
         let origin = origin_language.to_name();
         let lang = te.language.to_name();
@@ -418,8 +418,8 @@ async fn translate(
 
     // save target lang doc to db
     let content = cbor_to_vec(&content_list);
-    if content.is_err() {
-        let err = content.unwrap_err().to_string();
+    if let Err(err) = content {
+        let err = err.to_string();
         let mut cols = ColumnsMap::with_capacity(2);
         cols.set_as("updated_at", &(unix_ms() as i64));
         cols.set_as("error", &err);
diff --git a/src/db/scylladb.rs b/src/db/scylladb.rs
index 62addff..9a32027 100644
--- a/src/db/scylladb.rs
+++ b/src/db/scylladb.rs
@@ -123,12 +123,11 @@ pub async fn exec_cqls(db: &ScyllaDB, cqls: &str) -> anyhow::Result<()> {
             .execute(cql.clone(), &[])
             .await
             .map_err(|err| anyhow::anyhow!("\ncql: {}\nerror: {}", &cql, &err));
-        if res.is_err() {
-            let res = res.unwrap_err();
-            if res.to_string().contains("Index already exists") {
-                println!("WARN: {}", res);
+        if let Err(err) = res {
+            if err.to_string().contains("Index already exists") {
+                println!("WARN: {}", err);
             } else {
-                return Err(res);
+                return Err(err);
             }
         }
     }