fmt code

cnblogs · Jan 24, 2024 · 571bac6 · 571bac6
1 parent f18a785
commit 571bac6
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 24 deletions.
diff --git a/src/apis/ing/mod.rs b/src/apis/ing/mod.rs
@@ -37,7 +37,7 @@ pub struct IngContent {
 
 impl Default for IngContent {
     fn default() -> Self {
-        IngContent {
+        Self {
             content: "".to_string(),
             is_private: true,
             lucky: false,
@@ -48,7 +48,7 @@ impl Default for IngContent {
 
 impl Default for IngSendFrom {
     fn default() -> Self {
-        return IngSendFrom::Cli;
+        Self::Cli
     }
 }
 
@@ -67,12 +67,12 @@ pub struct QeurySet {
 
 impl Default for QeurySet {
     fn default() -> Self {
-        return Self {
+        Self {
             r#type: QueryIngType::default(),
             page_index: 1,
             page_size: 10,
             tag: "".to_string(),
-        };
+        }
     }
 }
 
@@ -99,7 +99,7 @@ pub enum QueryIngType {
 
 impl Default for QueryIngType {
     fn default() -> Self {
-        return Self::All;
+        Self::All
     }
 }
 
@@ -119,16 +119,16 @@ impl From<u8> for QueryIngType {
 }
 
 impl QueryIngType {
-    fn as_u8(&self) -> u8 {
+    const fn as_u8(&self) -> u8 {
         match self {
-            QueryIngType::Following => 1,
-            QueryIngType::My => 4,
-            QueryIngType::All => 5,
-            QueryIngType::RecentComment => 6,
-            QueryIngType::MyComment => 7,
-            QueryIngType::Tag => 10,
-            QueryIngType::Mention => 14,
-            QueryIngType::Comment => 13,
+            Self::Following => 1,
+            Self::My => 4,
+            Self::All => 5,
+            Self::RecentComment => 6,
+            Self::MyComment => 7,
+            Self::Tag => 10,
+            Self::Mention => 14,
+            Self::Comment => 13,
         }
     }
 }

diff --git a/src/apis/token/mod.rs b/src/apis/token/mod.rs
@@ -69,7 +69,7 @@ pub struct OauthTokenReq {
 
 impl OauthTokenReq {
     pub fn new(client_id: String, client_secret: String, code: String) -> Self {
-        OauthTokenReq {
+        Self {
             cc: ClientCredentialsReq {
                 client_id,
                 client_secret,
@@ -107,14 +107,14 @@ pub struct RefreshTokenReq {
 
 impl RefreshTokenReq {
     pub fn new(client_id: String, client_secret: String, refresh_token: String) -> Self {
-        return RefreshTokenReq {
+        Self {
             cc: ClientCredentialsReq {
                 client_id,
                 client_secret,
                 grant_type: "refresh_token".to_string(),
             },
             refresh_token,
-        };
+        }
     }
 }
 

diff --git a/src/args/parser/ing.rs b/src/args/parser/ing.rs
@@ -93,8 +93,8 @@ pub fn query(args: &Args) -> Option<QueryIng> {
             global_opt: _,
         } => QueryIng {
             r#type: r#type.clone(),
-            page_index: page_index.clone(),
-            page_size: page_size.clone(),
+            page_index: *page_index,
+            page_size: *page_size,
             tag: tag.clone(),
             id: id.clone(),
         },
@@ -126,8 +126,8 @@ pub fn create_ing(args: &Args) -> Option<CreateIng> {
             global_opt: _,
         } => CreateIng {
             content: content.clone(),
-            private: private.clone(),
-            lucky: lucky.clone(),
+            private: *private,
+            lucky: *lucky,
             tag: tag.clone(),
         },
         _ => return None,

diff --git a/src/logic/ing.rs b/src/logic/ing.rs
@@ -35,14 +35,13 @@ pub async fn get_ings_and_comments(
             .map(|x| x.unwrap())
             .collect::<Vec<IngEntry>>();
 
-        return get_ing_comments(t, a).await;
+        get_ing_comments(t, a).await
     } else {
         let a = iq(t, &q.into())
             .await?
             .into_iter()
-            .map(|x| x.into())
             .collect::<Vec<api::ing::get_list::IngEntry>>();
-        return get_ing_comments(t, a).await;
+        get_ing_comments(t, a).await
     }
 }