Merge pull request #784 from ribru17/clip_emmylua_ls

Address the rest of the clippy lints

Author: CppCXY

crates/emmylua_check/src/init.rs

@@ -3,11 +3,14 @@ use emmylua_code_analysis::{
 };
 use fern::Dispatch;
 use log::LevelFilter;
-use std::{path::PathBuf, str::FromStr};
+use std::{
+    path::{Path, PathBuf},
+    str::FromStr,
+};
 
-fn root_from_configs(config_paths: &Vec<PathBuf>, fallback: &PathBuf) -> PathBuf {
+fn root_from_configs(config_paths: &[PathBuf], fallback: &Path) -> PathBuf {
     if config_paths.len() != 1 {
-        fallback.clone()
+        fallback.to_path_buf()
     } else {
         let config_path = &config_paths[0];
         // Need to convert to canonical path to ensure parent() is not an empty
@@ -20,7 +23,7 @@ fn root_from_configs(config_paths: &Vec<PathBuf>, fallback: &PathBuf) -> PathBuf
                     config_path,
                     err
                 );
-                fallback.clone()
+                fallback.to_path_buf()
             }
         }
     }

crates/emmylua_code_style/src/bin/emmylua_format.rs

@@ -134,11 +134,9 @@ fn main() {
                         }
                     }
                 } else if args.write {
-                    if changed {
-                        if let Err(e) = fs::write(path, formatted) {
-                            eprintln!("Failed to write {}: {e}", path.to_string_lossy());
-                            exit_code = 2;
-                        }
+                    if changed && let Err(e) = fs::write(path, formatted) {
+                        eprintln!("Failed to write {}: {e}", path.to_string_lossy());
+                        exit_code = 2;
                     }
                 } else if let Some(out) = &args.output {
                     if let Err(e) = fs::write(out, formatted) {

crates/emmylua_code_style/src/test/mod.rs

@@ -1,3 +1,4 @@
+#[allow(clippy::module_inception)]
 #[cfg(test)]
 mod test {
     use crate::{reformat_lua_code, styles::LuaCodeStyle};

crates/emmylua_doc_cli/src/init.rs

@@ -3,11 +3,15 @@ use emmylua_code_analysis::{
 };
 use fern::Dispatch;
 use log::LevelFilter;
-use std::{path::PathBuf, str::FromStr, sync::Arc};
+use std::{
+    path::{Path, PathBuf},
+    str::FromStr,
+    sync::Arc,
+};
 
-fn root_from_configs(config_paths: &Vec<PathBuf>, fallback: &PathBuf) -> PathBuf {
+fn root_from_configs(config_paths: &[PathBuf], fallback: &Path) -> PathBuf {
     if config_paths.len() != 1 {
-        fallback.clone()
+        fallback.to_path_buf()
     } else {
         let config_path = &config_paths[0];
         // Need to convert to canonical path to ensure parent() is not an empty
@@ -20,7 +24,7 @@ fn root_from_configs(config_paths: &Vec<PathBuf>, fallback: &PathBuf) -> PathBuf
                     config_path,
                     err
                 );
-                fallback.clone()
+                fallback.to_path_buf()
             }
         }
     }

crates/emmylua_doc_cli/src/markdown_generator/generator/index_gen.rs

@@ -2,11 +2,7 @@ use tera::Tera;
 
 use crate::markdown_generator::markdown_types::MkdocsIndex;
 
-pub fn generate_index(
-    tl: &Tera,
-    mkdocs: &mut MkdocsIndex,
-    output: &std::path::PathBuf,
-) -> Option<()> {
+pub fn generate_index(tl: &Tera, mkdocs: &mut MkdocsIndex, output: &std::path::Path) -> Option<()> {
     let mut context = tera::Context::new();
     mkdocs.types.sort_by(|a, b| a.name.cmp(&b.name));
     mkdocs.modules.sort_by(|a, b| a.name.cmp(&b.name));

crates/emmylua_doc_cli/src/markdown_generator/generator/mod_gen.rs

@@ -25,8 +25,10 @@ pub fn generate_module_markdown(
     check_filter(db, module.file_id)?;
 
     let mut context = tera::Context::new();
-    let mut doc = Doc::default();
-    doc.name = module.full_module_name.clone();
+    let mut doc = Doc {
+        name: module.full_module_name.clone(),
+        ..Default::default()
+    };
     let property_owner_id = module.semantic_id.clone();
     if let Some(property_id) = property_owner_id {
         doc.property = collect_property(db, property_id);

crates/emmylua_doc_cli/src/markdown_generator/generator/typ_gen.rs

@@ -23,8 +23,10 @@ pub fn generate_type_markdown(
     check_filter(db, typ)?;
     let mut context = tera::Context::new();
     let typ_name = typ.get_name();
-    let mut doc = Doc::default();
-    doc.name = typ_name.to_string();
+    let mut doc = Doc {
+        name: typ_name.to_string(),
+        ..Default::default()
+    };
 
     if typ.is_class() {
         generate_class_type_markdown(db, tl, typ, &mut doc, &mut context, output, mkdocs_index);

crates/emmylua_ls/src/context/client_id.rs

@@ -1,19 +1,14 @@
 use lsp_types::ClientInfo;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub enum ClientId {
     VSCode,
     Intellij,
     Neovim,
+    #[default]
     Other,
 }
 
-impl Default for ClientId {
-    fn default() -> Self {
-        ClientId::Other
-    }
-}
-
 #[allow(unused)]
 impl ClientId {
     pub fn is_vscode(&self) -> bool {
@@ -56,10 +51,7 @@ fn check_vscode(client_info: &ClientInfo) -> bool {
         return true;
     }
 
-    match name.as_str() {
-        "Cursor" | "Windsurf" | "Trae" | "Qoder" => true,
-        _ => false,
-    }
+    matches!(name.as_str(), "Cursor" | "Windsurf" | "Trae" | "Qoder")
 }
 
 fn check_lsp4ij(client_info: &ClientInfo) -> bool {

crates/emmylua_ls/src/context/file_diagnostic.rs

@@ -40,13 +40,13 @@ impl FileDiagnostic {
 
         // create new token
         let cancel_token = CancellationToken::new();
-        tokens.insert(file_id.clone(), cancel_token.clone());
+        tokens.insert(file_id, cancel_token.clone());
         drop(tokens); // free the lock
 
         let analysis = self.analysis.clone();
         let client = self.client.clone();
         let diagnostic_tokens = self.diagnostic_tokens.clone();
-        let file_id_clone = file_id.clone();
+        let file_id_clone = file_id;
 
         // Spawn a new task to perform diagnostic
         tokio::spawn(async move {
@@ -177,7 +177,7 @@ async fn workspace_diagnostic(
     let mut count = 0;
     if valid_file_count != 0 {
         if silent {
-            while let Some(_) = rx.recv().await {
+            while (rx.recv().await).is_some() {
                 count += 1;
                 if count == valid_file_count {
                     break;
@@ -187,7 +187,7 @@ async fn workspace_diagnostic(
             let text = format!("diagnose {} files", valid_file_count);
             let _p = Profile::new(text.as_str());
             let mut last_percentage = 0;
-            while let Some(_) = rx.recv().await {
+            while (rx.recv().await).is_some() {
                 count += 1;
                 let percentage_done = ((count as f32 / valid_file_count as f32) * 100.0) as u32;
                 if last_percentage != percentage_done {

crates/emmylua_ls/src/context/status_bar.rs

@@ -4,7 +4,6 @@ use lsp_types::{
     NumberOrString, ProgressParams, ProgressParamsValue, WorkDoneProgress, WorkDoneProgressBegin,
     WorkDoneProgressCreateParams, WorkDoneProgressEnd, WorkDoneProgressReport,
 };
-use serde::{Deserialize, Serialize};
 
 use crate::util::time_cancel_token;
 
@@ -104,16 +103,3 @@ impl StatusBar {
         )
     }
 }
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct EmmyServerStatus {
-    health: String,
-    loading: bool,
-    message: String,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct EmmyProgress {
-    text: String,
-    percent: f64,
-}