chore: clippy

noaione · Jan 5, 2024 · 627bb7b · 627bb7b
1 parent 78f081c
commit 627bb7b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 37 deletions.
diff --git a/tosho/src/impl/kmkc/accounts.rs b/tosho/src/impl/kmkc/accounts.rs
@@ -84,12 +84,9 @@ pub(crate) async fn kmkc_account_login_web(
         Ok(account) => {
             console.info(&cformat!("Authenticated as <m,s>{}</>", account.name));
             let old_config = all_configs.iter().find(|&c| match c {
-                crate::config::ConfigImpl::Kmkc(c) => match c {
-                    super::config::Config::Web(cc) => {
-                        cc.account_id == account.id && cc.device_id == account.user_id
-                    }
-                    _ => false,
-                },
+                crate::config::ConfigImpl::Kmkc(super::config::Config::Web(cc)) => {
+                    cc.account_id == account.id && cc.device_id == account.user_id
+                }
                 _ => false,
             });
 
@@ -105,12 +102,9 @@ pub(crate) async fn kmkc_account_login_web(
                 }
 
                 match old_config {
-                    crate::config::ConfigImpl::Kmkc(c) => match c {
-                        super::config::Config::Web(cc) => {
-                            acc_config = acc_config.with_id(cc.id.clone());
-                        }
-                        _ => unreachable!(),
-                    },
+                    crate::config::ConfigImpl::Kmkc(super::config::Config::Web(cc)) => {
+                        acc_config = acc_config.with_id(cc.id.clone());
+                    }
                     _ => unreachable!(),
                 }
             }
@@ -145,10 +139,9 @@ pub(crate) async fn kmkc_account_login_mobile(
 
     // find old config
     let old_config = all_configs.iter().find(|&c| match c {
-        crate::config::ConfigImpl::Kmkc(c) => match c {
-            super::config::Config::Mobile(cc) => cc.device_id == user_id,
-            _ => false,
-        },
+        crate::config::ConfigImpl::Kmkc(super::config::Config::Mobile(cc)) => {
+            cc.device_id == user_id
+        }
         _ => false,
     });
 
@@ -162,12 +155,9 @@ pub(crate) async fn kmkc_account_login_mobile(
         }
 
         match old_config {
-            crate::config::ConfigImpl::Kmkc(c) => match c {
-                super::config::Config::Mobile(cc) => {
-                    old_id = Some(cc.id.clone());
-                }
-                _ => unreachable!(),
-            },
+            crate::config::ConfigImpl::Kmkc(super::config::Config::Mobile(cc)) => {
+                old_id = Some(cc.id.clone());
+            }
             _ => unreachable!(),
         }
     }
@@ -219,10 +209,9 @@ pub async fn kmkc_account_login(
 
     // find old config
     let old_config = all_configs.iter().find(|&c| match c {
-        crate::config::ConfigImpl::Kmkc(c) => match c {
-            super::config::Config::Mobile(cc) => cc.email == email && platform == cc.platform(),
-            _ => false,
-        },
+        crate::config::ConfigImpl::Kmkc(super::config::Config::Mobile(cc)) => {
+            cc.email == email && platform == cc.platform()
+        }
         _ => false,
     });
 
@@ -236,12 +225,9 @@ pub async fn kmkc_account_login(
         }
 
         match old_config {
-            crate::config::ConfigImpl::Kmkc(c) => match c {
-                super::config::Config::Mobile(cc) => {
-                    old_id = Some(cc.id.clone());
-                }
-                _ => unreachable!(),
-            },
+            crate::config::ConfigImpl::Kmkc(super::config::Config::Mobile(cc)) => {
+                old_id = Some(cc.id.clone());
+            }
             _ => unreachable!(),
         }
     }

diff --git a/tosho/src/impl/kmkc/common.rs b/tosho/src/impl/kmkc/common.rs
@@ -45,10 +45,7 @@ pub(super) fn select_single_account(account_id: Option<&str>) -> Option<Config>
                     value: format!("{} [{}]", cc.id, cc.r#type().to_name()),
                 },
             }),
-            crate::config::ConfigImpl::Musq(c) => Some(ConsoleChoice {
-                name: c.id.clone(),
-                value: format!("{} [{}]", c.id, c.r#type().to_name()),
-            }),
+            _ => None,
         })
         .collect();
     if all_configs.is_empty() {

diff --git a/tosho_kmkc/src/config.rs b/tosho_kmkc/src/config.rs
@@ -316,7 +316,7 @@ impl TryFrom<String> for KMConfigWeb {
         let mut privacy = KMConfigWebKV::default();
 
         for cookie_line in value.lines() {
-            if cookie_line.starts_with("#") && !cookie_line.starts_with("#HttpOnly_") {
+            if cookie_line.starts_with('#') && !cookie_line.starts_with("#HttpOnly_") {
                 continue;
             }