fix warning by new version clippy

Author: CppCXY

crates/emmylua_code_analysis/src/compilation/analyzer/doc/type_ref_tags.rs

@@ -182,10 +182,9 @@ pub fn analyze_param(analyzer: &mut DocAnalyzer, tag: LuaDocTagParam) -> Option<
     };
 
     let nullable = tag.is_nullable();
-    let mut type_ref = if let Some(lua_doc_type) = tag.get_type() {
+    let mut type_ref = {
+        let lua_doc_type = tag.get_type()?;
         infer_type(&mut analyzer.type_context, lua_doc_type)
-    } else {
-        return None;
     };
 
     if nullable && !type_ref.is_nullable() {

crates/emmylua_code_analysis/src/config/config_loader.rs

@@ -28,7 +28,7 @@ pub fn load_configs_raw(config_files: Vec<PathBuf>, partial_emmyrcs: Option<Vec<
                 Err(e) => {
                     log::error!(
                         "Failed to parse lua config file: {:?}, error: {:?}",
-                        &config_file,
+                        config_file,
                         e
                     );
                     continue;
@@ -40,7 +40,7 @@ pub fn load_configs_raw(config_files: Vec<PathBuf>, partial_emmyrcs: Option<Vec<
                 Err(e) => {
                     log::error!(
                         "Failed to parse config file: {:?}, error: {:?}",
-                        &config_file,
+                        config_file,
                         e
                     );
                     continue;

crates/emmylua_code_analysis/src/db_index/module/mod.rs

@@ -164,9 +164,9 @@ impl LuaModuleIndex {
         let node = self.module_nodes.get_mut(&parent_node_id)?;
 
         node.file_ids.push(file_id);
-        let module_name = match module_parts.last() {
-            Some(name) => name.to_string(),
-            None => return None,
+        let module_name = {
+            let name = module_parts.last()?;
+            name.to_string()
         };
         let module_info = ModuleInfo {
             file_id,
@@ -274,9 +274,9 @@ impl LuaModuleIndex {
         let mut parent_node_id = self.module_root_id;
         for part in module_parts {
             let parent_node = self.module_nodes.get(&parent_node_id)?;
-            let child_id = match parent_node.children.get(*part) {
-                Some(id) => *id,
-                None => return None,
+            let child_id = {
+                let id = parent_node.children.get(*part)?;
+                *id
             };
             parent_node_id = child_id;
         }

crates/emmylua_code_analysis/src/db_index/type/type_decl.rs

@@ -317,11 +317,11 @@ impl Serialize for LuaTypeDeclId {
         match self.id.as_ref() {
             LuaTypeIdentifier::Global(name) => serializer.serialize_str(name.as_ref()),
             LuaTypeIdentifier::Internal(workspace_id, name) => {
-                let s = format!("ws:{}|{}", workspace_id.id, &name);
+                let s = format!("ws:{}|{}", workspace_id.id, name);
                 serializer.serialize_str(&s)
             }
             LuaTypeIdentifier::File(file_id, name) => {
-                let s = format!("{}|{}", file_id.id, &name);
+                let s = format!("{}|{}", file_id.id, name);
                 serializer.serialize_str(&s)
             }
         }

crates/emmylua_code_analysis/src/semantic/infer/infer_index/mod.rs

@@ -140,9 +140,9 @@ pub fn get_index_expr_var_ref_id(
     cache: &mut LuaInferCache,
     index_expr: &LuaIndexExpr,
 ) -> Option<VarRefId> {
-    let access_path = match index_expr.get_access_path() {
-        Some(path) => ArcIntern::new(SmolStr::new(&path)),
-        None => return None,
+    let access_path = {
+        let path = index_expr.get_access_path()?;
+        ArcIntern::new(SmolStr::new(&path))
     };
 
     let mut prefix_expr = index_expr.get_prefix_expr()?;

crates/emmylua_code_analysis/src/semantic/member/find_members.rs

@@ -663,7 +663,7 @@ fn find_namespace_members(
                     overload_index: None,
                 });
             } else {
-                let ns_type = LuaType::Namespace(SmolStr::new(format!("{}.{}", ns, &name)).into());
+                let ns_type = LuaType::Namespace(SmolStr::new(format!("{}.{}", ns, name)).into());
                 members.push(LuaMemberInfo {
                     property_owner_id: None,
                     key: member_key,

crates/emmylua_code_analysis/src/semantic/semantic_info/infer_expr_semantic_decl.rs

@@ -129,13 +129,10 @@ fn infer_require_module_semantic_decl(
     let first_arg = call_expr.get_args_list()?.get_args().next()?;
     let module_path = match first_arg {
         LuaExpr::LiteralExpr(literal_expr) => {
-            if let Some(literal_token) = literal_expr.get_literal() {
-                match literal_token {
-                    LuaLiteralToken::String(string_token) => string_token.get_value(),
-                    _ => return None,
-                }
-            } else {
-                return None;
+            let literal_token = literal_expr.get_literal()?;
+            match literal_token {
+                LuaLiteralToken::String(string_token) => string_token.get_value(),
+                _ => return None,
             }
         }
         _ => return None,

crates/emmylua_ls/src/context/file_diagnostic.rs

@@ -124,7 +124,7 @@ impl FileDiagnostic {
     #[allow(unused)]
     pub async fn cancel_all(&self) {
         let mut tokens = self.diagnostic_tokens.lock().await;
-        for (_, token) in tokens.iter() {
+        for token in tokens.values() {
             token.cancel();
         }
         tokens.clear();

crates/emmylua_ls/src/handlers/rename/rename_decl.rs

@@ -108,10 +108,9 @@ fn rename_doc_param(
     let closure_expr = param_node.ancestors::<LuaClosureExpr>().next()?;
     let comments = if let Some(table_field) = closure_expr.get_parent::<LuaTableField>() {
         table_field.get_comments()
-    } else if let Some(stat) = closure_expr.ancestors::<LuaStat>().next() {
-        stat.get_comments()
     } else {
-        return None;
+        let stat = closure_expr.ancestors::<LuaStat>().next()?;
+        stat.get_comments()
     };
 
     let document = semantic_model.get_document();