Migrate to edition 2024

Author: Nadrieril

charon/Cargo.toml

@@ -5,7 +5,7 @@ authors = [
     "Son Ho <hosonmarc@gmail.com>",
     "Guillaume Boisseau <nadrieril+git@gmail.com>",
 ]
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 
 [lib]

charon/src/bin/generate-ml/main.rs

@@ -902,13 +902,13 @@ impl GenerateCodeFor {
                         })
                         .join("\n");
                     if let Some(visitors) = visitors {
-                        let DeriveVisitors {
+                        let &DeriveVisitors {
                             name,
                             mut ancestors,
                             reduce,
                             extra_types,
                         } = visitors;
-                        let varieties: &[_] = if *reduce {
+                        let varieties: &[_] = if reduce {
                             &["iter", "map", "reduce", "mapreduce"]
                         } else {
                             &["iter", "map"]
@@ -921,7 +921,7 @@ impl GenerateCodeFor {
                                 ctx,
                                 &intermediate_visitor_name,
                                 ancestors,
-                                *reduce,
+                                reduce,
                                 extra_types
                                     .iter()
                                     .map(|s| s.to_string())
@@ -930,7 +930,9 @@ impl GenerateCodeFor {
                             );
                             intermediate_visitor_name_slice = [intermediate_visitor_name.as_str()];
                             ancestors = &intermediate_visitor_name_slice;
-                            decls = format!("(* Ancestors for the {name} visitors *){intermediate_visitor}\n{decls}");
+                            decls = format!(
+                                "(* Ancestors for the {name} visitors *){intermediate_visitor}\n{decls}"
+                            );
                         }
                         let visitors = varieties
                             .iter()

charon/src/ids/vector.rs

@@ -290,7 +290,7 @@ where
         self.iter_indexed().map(|(id, _)| id)
     }
 
-    pub fn all_indices(&self) -> impl Iterator<Item = I> {
+    pub fn all_indices(&self) -> impl Iterator<Item = I> + use<I, T> {
         self.vector.indices()
     }
 

charon/src/transform/expand_associated_types.rs

@@ -775,7 +775,7 @@ impl<'a> ComputeItemModifications<'a> {
         &'b mut self,
         clause: &TraitClause,
         clause_to_path: fn(TraitClauseId) -> TraitRefPath,
-    ) -> impl Iterator<Item = AssocTypePath> + use<'b> {
+    ) -> impl Iterator<Item = AssocTypePath> + use<'a, 'b> {
         let trait_id = clause.trait_.skip_binder.id;
         let clause_path = clause_to_path(clause.clause_id);
         self.compute_extra_params_for_trait(trait_id)