[IMP] core: upgrade Rust to 2024 edition

Author: fda-odoo

server/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "odoo_ls_server"
 version = "0.12.0"
-edition = "2021"
+edition = "2024"
 authors = ["Odoo"]
 readme = "../README.md"
 repository = "https://github.com/odoo/odoo-ls"

server/benches/iai_profiler.rs

@@ -23,7 +23,8 @@ run cargo install --version 0.14.0 iai-callgrind-runner
 
 #[library_benchmark]
 fn iai_main() {
-    env::set_var("RUST_BACKTRACE", "full");
+    // TODO: Audit that the environment access only happens in single-threaded code.
+    unsafe { env::set_var("RUST_BACKTRACE", "full") };
 
     let log_level = LogLevel::INFO;
     let log_level = match log_level {

server/src/allocator.rs

@@ -6,27 +6,27 @@ pub struct TrackingAllocator;
 pub static ALLOCATED: AtomicUsize = AtomicUsize::new(0);
 
 unsafe impl GlobalAlloc for TrackingAllocator {
-    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
+    unsafe fn alloc(&self, layout: Layout) -> *mut u8 { unsafe {
         let size = layout.size();
         ALLOCATED.fetch_add(size, Ordering::SeqCst);
         System.alloc(layout)
-    }
+    }}
 
-    unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
+    unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) { unsafe {
         let size = layout.size();
         ALLOCATED.fetch_sub(size, Ordering::SeqCst);
         System.dealloc(ptr, layout)
-    }
+    }}
 
     unsafe fn realloc(
         &self,
         ptr: *mut u8,
         old_layout: Layout,
         new_size: usize,
-    ) -> *mut u8 {
+    ) -> *mut u8 { unsafe {
         let old_size = old_layout.size();
         ALLOCATED.fetch_sub(old_size, Ordering::SeqCst);
         ALLOCATED.fetch_add(new_size, Ordering::SeqCst);
         System.realloc(ptr, old_layout, new_size)
-    }
+    }}
 }

server/src/core/config.rs

@@ -105,8 +105,8 @@ pub struct DiagnosticFilter {
 }
 
 /// Serialize the schema as Vec<String> and adds the default
-fn regex_vec_schema(gen: &mut SchemaGenerator) -> Schema {
-    let mut schema = <Vec<String>>::json_schema(gen);
+fn regex_vec_schema(generator: &mut SchemaGenerator) -> Schema {
+    let mut schema = <Vec<String>>::json_schema(generator);
     schema.insert("default".into(), serde_json::json!([]));
     schema
 }
@@ -1404,7 +1404,7 @@ fn merge_all_workspaces(
 pub fn get_configuration(ws_folders: &HashMap<String, String>, cli_config_file: &Option<String>)  -> Result<(ConfigNew, ConfigFile), String> {
     let mut ws_confs: Vec<HashMap<String, ConfigEntryRaw>> = Vec::new();
 
-    if let Some(ref path) = cli_config_file {
+    if let Some(path) = cli_config_file {
         let config_from_file = load_config_from_file(path.clone(), ws_folders)?;
         ws_confs.push(config_from_file);
     }

server/src/core/evaluation.rs

@@ -1675,7 +1675,7 @@ impl EvaluationSymbol {
 
     pub fn get_weak_mut(&mut self) -> &mut EvaluationSymbolWeak {
         match &mut self.sym {
-            EvaluationSymbolPtr::WEAK(ref mut w) => w,
+            EvaluationSymbolPtr::WEAK(w) => w,
             _ => panic!("Not an EvaluationSymbolWeak")
         }
     }

server/src/core/python_arch_builder.rs

@@ -105,24 +105,21 @@ impl PythonArchBuilder {
         let file_info = file_info_rc.borrow();
         if file_info.file_info_ast.borrow().indexed_module.is_some() {
             let file_info_ast= file_info.file_info_ast.borrow();
-            let ast = match self.file_mode {
-                true => {
-                    file_info_ast.get_stmts().as_ref().unwrap()
-                },
-                false => {
-                    let ast_index = self.sym_stack[0].borrow().node_index().unwrap().load();
-                    if ast_index.as_u32() != u32::MAX {
-                        let func = file_info_ast.indexed_module.as_ref().unwrap().get_by_index(ast_index);
-                        match func {
-                            AnyRootNodeRef::Stmt(Stmt::FunctionDef(func_stmt)) => {
-                                &func_stmt.body
-                            },
-                            _ => panic!("Expected function definition")
-                        }
-                    } else {
-                        //if ast_index is empty, this is because the function has been added manually and do not belong to the ast. Skip it's building
-                        &vec![]
+            let ast = if self.file_mode {
+                file_info_ast.get_stmts().unwrap()
+            } else {
+                let ast_index = self.sym_stack[0].borrow().node_index().unwrap().load();
+                if ast_index.as_u32() != u32::MAX {
+                    let func = file_info_ast.indexed_module.as_ref().unwrap().get_by_index(ast_index);
+                    match func {
+                        AnyRootNodeRef::Stmt(Stmt::FunctionDef(func_stmt)) => {
+                            &func_stmt.body
+                        },
+                        _ => panic!("Expected function definition")
                     }
+                } else {
+                    //if ast_index is empty, this is because the function has been added manually and do not belong to the ast. Skip it's building
+                    &vec![]
                 }
             };
             let old_stack_noqa = session.noqas_stack.clone();

server/src/core/python_arch_eval.rs

@@ -974,7 +974,7 @@ impl PythonArchEval {
             );
             for eval in evaluations.iter_mut() { //as this is an evaluation, we need to set the instance to true
                 match eval.symbol.get_mut_symbol_ptr() {
-                    EvaluationSymbolPtr::WEAK(ref mut sym_weak) => {
+                    EvaluationSymbolPtr::WEAK(sym_weak) => {
                         sym_weak.instance = Some(true);
                     },
                     _ => {}

server/src/core/symbols/symbol.rs

@@ -2137,7 +2137,7 @@ impl Symbol {
                                     if !get_result.weak.is_expired() {
                                         let mut eval = Evaluation::eval_from_symbol(&get_result.weak, get_result.instance);
                                         match eval.symbol.get_mut_symbol_ptr() {
-                                            EvaluationSymbolPtr::WEAK(ref mut weak) => {
+                                            EvaluationSymbolPtr::WEAK(weak) => {
                                                 if let Some(eval_sym_rc) = weak.weak.upgrade(){
                                                     if Rc::ptr_eq(&eval_sym_rc, &symbol_rc){
                                                         continue;
@@ -2308,7 +2308,7 @@ impl Symbol {
         }
     }
 
-    pub fn all_symbols(&self) -> impl Iterator<Item= Rc<RefCell<Symbol>>> {
+    pub fn all_symbols(&self) -> impl Iterator<Item= Rc<RefCell<Symbol>>> + use<> {
         //return an iterator on all symbols of self. only symbols in symbols and module_symbols will
         //be returned.
         let mut iter: Vec<Rc<RefCell<Symbol>>> = Vec::new();
@@ -2545,7 +2545,7 @@ impl Symbol {
         }
     }
 
-    pub fn get_sorted_symbols(&self) -> impl Iterator<Item = Rc<RefCell<Symbol>>> {
+    pub fn get_sorted_symbols(&self) -> impl Iterator<Item = Rc<RefCell<Symbol>>> + use<> {
         let mut symbols: Vec<Rc<RefCell<Symbol>>> = Vec::new();
         match self {
             Symbol::Class(_) | Symbol::Function(_) | Symbol::File(_) | Symbol::Package(PackageSymbol::Module(_)) |

server/src/core/xml_data.rs

@@ -56,27 +56,27 @@ impl OdooData {
 
     pub fn set_file_symbol(&mut self, xml_symbol: &Rc<RefCell<Symbol>>) {
         match self {
-            OdooData::RECORD(ref mut record) => {
+            OdooData::RECORD(record) => {
                 record.file_symbol = Rc::downgrade(xml_symbol);
             },
-            OdooData::MENUITEM(ref mut menu_item) => {
+            OdooData::MENUITEM(menu_item) => {
                 menu_item.file_symbol = Rc::downgrade(xml_symbol);
             },
-            OdooData::TEMPLATE(ref mut template) => {
+            OdooData::TEMPLATE(template) => {
                 template.file_symbol = Rc::downgrade(xml_symbol);
             },
-            OdooData::DELETE(ref mut delete) => {
+            OdooData::DELETE(delete) => {
                 delete.file_symbol = Rc::downgrade(xml_symbol);
             },
         }
     }
 
     pub fn get_range(&self) -> Range<usize> {
         match self {
-            OdooData::RECORD(ref record) => record.range.clone(),
-            OdooData::MENUITEM(ref menu_item) => menu_item.range.clone(),
-            OdooData::TEMPLATE(ref template) => template.range.clone(),
-            OdooData::DELETE(ref delete) => delete.range.clone(),
+            OdooData::RECORD(record) => record.range.clone(),
+            OdooData::MENUITEM(menu_item) => menu_item.range.clone(),
+            OdooData::TEMPLATE(template) => template.range.clone(),
+            OdooData::DELETE(delete) => delete.range.clone(),
         }
     }
 
@@ -93,16 +93,16 @@ impl OdooData {
     /* Warning: the returned symbol can of a different type than an XML_SYMBOL */
     pub fn get_file_symbol(&self) -> Option<Weak<RefCell<Symbol>>> {
         match self {
-            OdooData::RECORD(ref record) => {
+            OdooData::RECORD(record) => {
                 Some(record.file_symbol.clone())
             },
-            OdooData::MENUITEM(ref menu_item) => {
+            OdooData::MENUITEM(menu_item) => {
                 Some(menu_item.file_symbol.clone())
             },
-            OdooData::TEMPLATE(ref template) => {
+            OdooData::TEMPLATE(template) => {
                 Some(template.file_symbol.clone())
             },
-            OdooData::DELETE(ref delete) => {
+            OdooData::DELETE(delete) => {
                 Some(delete.file_symbol.clone())
             }
         }

server/src/features/ast_utils.rs

@@ -194,7 +194,7 @@ impl<'a> Visitor<'a> for ExprFinderVisitor<'a> {
                     _ => &None
                 };
 
-                if let Some(ref ident) = ident {
+                if let Some(ident) = ident {
                     if ident.range().contains(self.offset) {
                         self.expr = Some(ExprOrIdent::Ident(ident));
                     }