ci: fix lint

Author: Thaumy

.github/actions/lint/action.yml

@@ -9,4 +9,5 @@ runs:
 
     - name: Clippy
       shell: bash
+      # You need to run 'cargo clippy -r' in the local to get the same output with CI
       run: cargo clippy -- -D warnings

src/api/auth/session.rs

@@ -20,7 +20,7 @@ fn save_pat(pat: &str, path: &Path) -> Result<()> {
 }
 
 fn get_cfg_path() -> Result<PathBuf> {
-    let home = home_dir().ok_or(anyhow!("Can not get home dir"))?;
+    let home = home_dir().ok_or_else(|| anyhow!("Can not get home dir"))?;
     home.join(".cnbrc").into_ok()
 }
 

src/api/ing/mod.rs

@@ -14,8 +14,8 @@ pub struct Ing {
 }
 
 impl Ing {
-    pub fn new(pat: String) -> Ing {
-        Ing { pat }
+    pub const fn new(pat: String) -> Self {
+        Self { pat }
     }
 }
 
@@ -48,14 +48,14 @@ impl TryFrom<usize> for IngSendFrom {
 
     fn try_from(value: usize) -> Result<Self, Self::Error> {
         match value {
-            0 => IngSendFrom::None,
-            1 => IngSendFrom::Ms,
-            2 => IngSendFrom::GTalk,
-            3 => IngSendFrom::Qq,
-            5 => IngSendFrom::Sms,
-            6 => IngSendFrom::CellPhone,
-            8 => IngSendFrom::Web,
-            9 => IngSendFrom::Code,
+            0 => Self::None,
+            1 => Self::Ms,
+            2 => Self::GTalk,
+            3 => Self::Qq,
+            5 => Self::Sms,
+            6 => Self::CellPhone,
+            8 => Self::Web,
+            9 => Self::Code,
             u => bail!("Unknown value of ing source: {}", u),
         }
         .into_ok()
@@ -76,12 +76,13 @@ pub fn fmt_content(content: &str) -> String {
         static ref REGEX: Regex =
             Regex::new(r#"<a.*href="https://home.cnblogs.com/u/.*?".*>(@.*?)</a>"#).unwrap();
     }
-    if let Some(caps) = REGEX.captures(content) {
-        let at_user = caps.get(1).unwrap().as_str();
-        REGEX.replace(content, at_user).to_string()
-    } else {
-        content.to_string()
-    }
+    REGEX.captures(content).map_or_else(
+        || content.to_string(),
+        |caps| {
+            let at_user = caps.get(1).unwrap().as_str();
+            REGEX.replace(content, at_user).to_string()
+        },
+    )
 }
 
 pub fn rm_ing_at_user_tag(text: &str) -> String {
@@ -97,9 +98,8 @@ pub fn get_ing_at_user_tag_text(text: &str) -> String {
         static ref REGEX: Regex =
             Regex::new(r#"<a.*href="https://home.cnblogs.com/u/.*?".*>@(.*?)</a>："#).unwrap();
     }
-    if let Some(caps) = REGEX.captures(text) {
-        caps.get(1).unwrap().as_str().to_string()
-    } else {
-        "".to_string()
-    }
+    REGEX.captures(text).map_or_else(
+        || "".to_string(),
+        |caps| caps.get(1).unwrap().as_str().to_string(),
+    )
 }

src/api/post/mod.rs

@@ -12,7 +12,7 @@ pub struct Post {
 }
 
 impl Post {
-    pub fn new(pat: String) -> Post {
-        Post { pat }
+    pub const fn new(pat: String) -> Self {
+        Self { pat }
     }
 }

src/api/user/mod.rs

@@ -5,7 +5,7 @@ pub struct User {
 }
 
 impl User {
-    pub fn new(pat: String) -> User {
-        User { pat }
+    pub const fn new(pat: String) -> Self {
+        Self { pat }
     }
 }

src/args/parser.rs

@@ -15,7 +15,7 @@ fn get_pat(pat: &Option<String>) -> Result<String> {
     pat.clone().or_eval_result(session::get_pat)
 }
 
-pub fn no_operation(args: &Args) -> bool {
+pub const fn no_operation(args: &Args) -> bool {
     matches!(
         args,
         Args {
@@ -97,7 +97,7 @@ pub fn login(args: &Args) -> Option<&String> {
     .into_some()
 }
 
-pub fn logout(args: &Args) -> bool {
+pub const fn logout(args: &Args) -> bool {
     matches!(
         args,
         Args {

src/display/normal.rs

@@ -49,7 +49,7 @@ pub fn list_ing(ing_list: &[(IngEntry, Vec<IngCommentEntry>)], rev: bool) {
                 let star_text = ing_star_tag_to_text(&ing.icons);
                 print!(" {}⭐", star_text);
             }
-            println!(" # {}", ing.id.to_string());
+            println!(" # {}", ing.id);
             let content = fmt_content(&ing.content);
             println!("  {}: {}", ing.user_name, content);
 
@@ -123,7 +123,7 @@ pub fn show_post_meta(entry: &PostEntry) -> Result<()> {
 pub fn list_post(entry_list: &[PostEntry], total_count: usize, rev: bool) {
     println!("{}/{}", entry_list.len(), total_count);
     entry_list.iter().dyn_rev(rev).for_each(|entry| {
-        print!("# {}", entry.id.to_string());
+        print!("# {}", entry.id);
         print!(" {}", entry.title);
         if entry.is_published {
             print!(" Pub");

src/infra/option.rs

@@ -22,9 +22,6 @@ impl<T> OptionExt<T> for Option<T> {
     where
         F: FnOnce() -> Result<T, E>,
     {
-        match self {
-            Some(val) => Ok(val),
-            _ => f(),
-        }
+        self.map_or_else(f, |val| Ok(val))
     }
 }

src/main.rs

@@ -3,6 +3,7 @@
 #![feature(let_chains)]
 #![feature(type_name_of_val)]
 #![feature(iterator_try_collect)]
+#![warn(clippy::all, clippy::nursery, clippy::cargo_common_metadata)]
 
 use crate::api::auth::session;
 use crate::api::ing::{Ing, IngType};