[IMP] server: clippy updates

Author: fda-odoo

server/src/constants.rs

@@ -14,7 +14,7 @@ pub fn tree(a: Vec<&str>, b: Vec<&str>) -> Tree {
 }
 
 pub fn flatten_tree(tree: &Tree) -> Vec<String> {
-    vec![tree.0.clone(), tree.1.clone()].concat()
+    [tree.0.clone(), tree.1.clone()].concat()
 }
 
 

server/src/core/odoo.rs

@@ -602,7 +602,7 @@ impl SyncOdoo {
                         path.components().for_each(|c| {
                             tree.0.push(c.as_os_str().to_str().unwrap().replace(".py", "").replace(".pyi", "").to_string());
                         });
-                        if vec!["__init__", "__manifest__"].contains(&tree.0.last().unwrap().as_str()) {
+                        if ["__init__", "__manifest__"].contains(&tree.0.last().unwrap().as_str()) {
                             tree.0.pop();
                         }
                         return Ok(tree);
@@ -617,7 +617,7 @@ impl SyncOdoo {
                 path.components().for_each(|c| {
                     tree.0.push(c.as_os_str().to_str().unwrap().replace(".py", "").to_string());
                 });
-                if tree.0.len() > 0 && vec!["__init__", "__manifest__"].contains(&tree.0.last().unwrap().as_str()) {
+                if tree.0.len() > 0 && ["__init__", "__manifest__"].contains(&tree.0.last().unwrap().as_str()) {
                     tree.0.pop();
                 }
                 return Ok(tree);
@@ -670,10 +670,10 @@ impl SyncOdoo {
     /* Consider the given 'tree' path as updated (or new) and move all symbols that were searching for it
         from the not_found_symbols list to the rebuild list. Return True is something should be rebuilt */
     pub fn search_symbols_to_rebuild(session: &mut SessionInfo, tree: &Tree) -> bool {
-        let flat_tree = vec![tree.0.clone(), tree.1.clone()].concat();
+        let flat_tree = [tree.0.clone(), tree.1.clone()].concat();
         let mut found_sym: PtrWeakHashSet<Weak<RefCell<Symbol>>> = PtrWeakHashSet::new();
         let mut need_rebuild = false;
-        let mut to_add = vec![vec![], vec![], vec![], vec![]]; //list of symbols to add after the loop (borrow issue)
+        let mut to_add = [vec![], vec![], vec![], vec![]]; //list of symbols to add after the loop (borrow issue)
         for s in session.sync_odoo.not_found_symbols.iter() {
             let mut index: i32 = 0; //i32 sa we could go in negative values
             while (index as usize) < s.borrow().not_found_paths().len() {

server/src/core/python_arch_builder.rs

@@ -131,7 +131,7 @@ impl PythonArchBuilder {
                     &mut None).remove(0); //we don't need the vector with this call as there will be 1 result.
                 if !import_result.found {
                     session.sync_odoo.not_found_symbols.insert(self.file.clone());
-                    let file_tree_flattened = vec![import_result.file_tree.0.clone(), import_result.file_tree.1.clone()].concat();
+                    let file_tree_flattened = [import_result.file_tree.0.clone(), import_result.file_tree.1.clone()].concat();
                     self.file.borrow_mut().not_found_paths_mut().push((self.current_step, file_tree_flattened));
                     continue;
                 }

server/src/core/python_arch_builder_hooks.rs

@@ -56,7 +56,7 @@ impl PythonArchBuilderHooks {
             "Binary" | "Image" | "Selection" | "Reference" | "Many2one" | "Many2oneReference" | "Json" |
             "Properties" | "PropertiesDefinition" | "One2many" | "Many2many" | "Id" => {
                 if sym.get_tree().0 == vec![S!("odoo"), S!("fields")] {
-                    if vec![S!("Many2one"), S!("Many2many"), S!("One2many")].contains(&sym.name()) {
+                    if [S!("Many2one"), S!("Many2many"), S!("One2many")].contains(&sym.name()) {
                         //TODO how to do this?
                     }
                     // ----------- __get__ ------------

server/src/core/python_arch_eval.rs

@@ -248,7 +248,7 @@ impl PythonArchEval {
                         }
                     }
                 } else {
-                    let mut file_tree = vec![_import_result.file_tree.0.clone(), _import_result.file_tree.1.clone()].concat();
+                    let mut file_tree = [_import_result.file_tree.0.clone(), _import_result.file_tree.1.clone()].concat();
                     file_tree.extend(_import_result.name.split(".").map(str::to_string));
                     self.file.borrow_mut().not_found_paths_mut().push((self.current_step, file_tree.clone()));
                     session.sync_odoo.not_found_symbols.insert(self.file.clone());
@@ -266,7 +266,7 @@ impl PythonArchEval {
                 }
 
             } else {
-                let mut file_tree = vec![_import_result.file_tree.0.clone(), _import_result.file_tree.1.clone()].concat();
+                let mut file_tree = [_import_result.file_tree.0.clone(), _import_result.file_tree.1.clone()].concat();
                 file_tree.extend(_import_result.name.split(".").map(str::to_string));
                 if BUILT_IN_LIBS.contains(&file_tree[0].as_str()) {
                     continue;

server/src/core/python_arch_eval_hooks.rs

@@ -63,7 +63,7 @@ static arch_eval_file_hooks: Lazy<Vec<PythonArchEvalFileHook>> = Lazy::new(|| {v
         let values: Vec<ruff_python_ast::Expr> = Vec::new();
         let mut id = symbol.borrow_mut();
         let range = id.range().clone();
-        id.set_evaluations(vec![Evaluation::new_list(odoo, values, range.clone())]);
+        id.set_evaluations(vec![Evaluation::new_list(odoo, values, range)]);
     }},
     /*PythonArchEvalFileHook { file_tree: vec![S!("odoo"), S!("models")],
                         content_tree: vec![S!("BaseModel"), S!("search_count")],
@@ -436,7 +436,7 @@ impl PythonArchEvalHooks {
                                 f.add_model_dependencies(model);
                             }
                             let symbols = model.clone().borrow().get_main_symbols(session, from_module.clone(), &mut None);
-                            if symbols.len() > 0 {
+                            if !symbols.is_empty() {
                                 for s in symbols.iter() {
                                     if from_module.is_none() || ModuleSymbol::is_in_deps(session, &from_module.as_ref().unwrap(),&s.borrow().find_module().unwrap().borrow().as_module_package().dir_name, &mut None) {
                                         return EvaluationSymbolWeak::new(Rc::downgrade(s), Some(true), false);

server/src/core/python_odoo_builder.rs

@@ -36,7 +36,7 @@ impl PythonOdooBuilder {
             return;
         }
         let mut path = symbol.paths()[0].clone();
-        if vec![SymType::NAMESPACE, SymType::ROOT, SymType::COMPILED].contains(&symbol.typ()) {
+        if [SymType::NAMESPACE, SymType::ROOT, SymType::COMPILED].contains(&symbol.typ()) {
             return;
         } else if matches!(symbol.typ(), SymType::PACKAGE(_)) {
             path = PathBuf::from(path).join("__init__").with_extension(S!("py") + symbol.as_package().i_ext().as_str()).sanitize();

server/src/core/python_utils.rs

@@ -81,7 +81,7 @@ fn _link_tuples(targets: Vec<Expr>, values: Vec<Expr>) -> Vec<Assign> {
     res
 }
 
-pub fn unpack_assign(targets: &Vec<Expr>, annotation: Option<&Box<Expr>>, value: Option<&Box<Expr>>) -> Vec<Assign> {
+pub fn unpack_assign(targets: &Vec<Expr>, annotation: Option<&Expr>, value: Option<&Expr>) -> Vec<Assign> {
     //Given the target, the annotation and the values, return a list of tuples (variable: ExprName, annotation, value)
     //for each variable, associating annotation and value for the right variable
     // Ex: for "a = b = 1", return [("a", None, 1), ("b", , None, 1)]
@@ -102,21 +102,15 @@ pub fn unpack_assign(targets: &Vec<Expr>, annotation: Option<&Box<Expr>>, value:
                     Some(value) => {
                         res.push(Assign {
                             target: expr.clone(),
-                            annotation: match annotation {
-                                Some(annotation) => Some(*annotation.clone()),
-                                None => None,
-                            },
-                            value: Some(*value.clone()),
+                            annotation: annotation.cloned(),
+                            value: Some(value.clone()),
                             index: None,
                         });
                     },
                     None => {
                         res.push(Assign {
                             target: expr.clone(),
-                            annotation: match annotation {
-                                Some(annotation) => Some(*annotation.clone()),
-                                None => None,
-                            },
+                            annotation: annotation.cloned(),
                             value: None,
                             index: None,
                         });
@@ -142,7 +136,7 @@ pub fn unpack_assign(targets: &Vec<Expr>, annotation: Option<&Box<Expr>>, value:
                                 res.push(Assign {
                                     target: tar.clone(),
                                     annotation: None,
-                                    value: Some(*value.clone()),
+                                    value: Some(value.clone()),
                                     index: Some(index),
                                 });
                             }
@@ -169,7 +163,7 @@ pub fn unpack_assign(targets: &Vec<Expr>, annotation: Option<&Box<Expr>>, value:
                                 res.push(Assign {
                                     target: tar.clone(),
                                     annotation: None,
-                                    value: Some(*value.clone()),
+                                    value: Some(value.clone()),
                                     index: Some(index),
                                 });
                             }

server/src/core/python_validator.rs

@@ -246,7 +246,7 @@ impl PythonValidator {
             if import_result.found && self.current_module.is_some() {
                 let module = import_result.symbol.borrow().find_module();
                 if let Some(module) = module {
-                    if !ModuleSymbol::is_in_deps(session, &self.current_module.as_ref().unwrap(), &module.borrow().as_module_package().dir_name, &mut None) && !self.safe_imports.last().unwrap() {
+                    if !ModuleSymbol::is_in_deps(session, self.current_module.as_ref().unwrap(), &module.borrow().as_module_package().dir_name, &mut None) && !self.safe_imports.last().unwrap() {
                         self.diagnostics.push(Diagnostic::new(
                             Range::new(Position::new(import_result.range.start().to_u32(), 0), Position::new(import_result.range.end().to_u32(), 0)),
                             Some(DiagnosticSeverity::ERROR),
@@ -327,13 +327,13 @@ impl PythonValidator {
                     if let Some(main_sym_module) = main_sym_module {
                         let module_name = main_sym_module.borrow().as_module_package().dir_name.clone();
                         main_modules.push(module_name.clone());
-                        if ModuleSymbol::is_in_deps(session, &from, &module_name, &mut None) {
+                        if ModuleSymbol::is_in_deps(session, from, &module_name, &mut None) {
                             found_one = true;
                         }
                     }
                 }
                 if !found_one {
-                    if main_modules.len() > 0 {
+                    if !main_modules.is_empty() {
                         self.diagnostics.push(Diagnostic::new(
                             Range::new(Position::new(range.start().to_u32(), 0), Position::new(range.end().to_u32(), 0)),
                             Some(DiagnosticSeverity::ERROR),
@@ -372,7 +372,7 @@ impl PythonValidator {
     }
 
     fn validate_expr(&mut self, session: &mut SessionInfo, expr: &Expr, max_infer: &TextSize) {
-        let (eval, diags) = Evaluation::eval_from_ast(session, &expr, self.sym_stack.last().unwrap().clone(), &max_infer);
+        let (eval, diags) = Evaluation::eval_from_ast(session, expr, self.sym_stack.last().unwrap().clone(), max_infer);
         self.diagnostics.extend(diags);
     }
 }

server/src/core/symbols/class_symbol.rs

@@ -69,16 +69,16 @@ impl ClassSymbol {
                 return false;
             }
             checked.as_mut().unwrap().insert(b.clone());
-            if b.borrow().as_class_sym().inherits(&base, checked) {
+            if b.borrow().as_class_sym().inherits(base, checked) {
                 return true;
             }
         }
         false
     }
 
     pub fn add_symbol(&mut self, content: &Rc<RefCell<Symbol>>, section: u32) {
-        let sections = self.symbols.entry(content.borrow().name().clone()).or_insert_with(|| HashMap::new());
-        let section_vec = sections.entry(section).or_insert_with(|| vec![]);
+        let sections = self.symbols.entry(content.borrow().name().clone()).or_insert(HashMap::new());
+        let section_vec = sections.entry(section).or_insert(vec![]);
         section_vec.push(content.clone());
     }