chore: update to Rust v1.85.0 and 2024 edition (#273)

Mainly a preparation for (hopefully) soon-to-be-stabilized if-let-chains[^1]

[^1]: rust-lang/rust#53667

Reviewed-on: https://codeberg.org/mergiraf/mergiraf/pulls/273
Reviewed-by: Antonin Delpeuch <[email protected]>
Co-authored-by: Ada Alakbarova <[email protected]>
Co-committed-by: Ada Alakbarova <[email protected]>

Author: ada4a

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "mergiraf"
 version = "0.6.0"
-edition = "2021"
+edition = "2024"
 license = "GPL-3.0-only"
 repository = "https://codeberg.org/mergiraf/mergiraf"
 keywords = ["git", "tree-sitter", "merge-driver"]

flake.lock

@@ -7,7 +7,7 @@ use std::{
     process::Command,
 };
 
-use etcetera::{choose_app_strategy, AppStrategy, AppStrategyArgs};
+use etcetera::{AppStrategy, AppStrategyArgs, choose_app_strategy};
 use itertools::Itertools;
 use log::warn;
 use rand::distr::{Alphanumeric, SampleString};

src/attempts.rs

@@ -2,13 +2,15 @@ use std::{
     borrow::Cow,
     env, fs,
     path::{Path, PathBuf},
-    process::{exit, Command},
+    process::{Command, exit},
     time::Duration,
 };
 
 use clap::{ArgAction, Parser, Subcommand};
 use log::warn;
 use mergiraf::{
+    DISABLING_ENV_VAR,
+    PathBufExt,
     attempts::AttemptsCache,
     bug_reporter::report_bug,
     languages,
@@ -17,8 +19,6 @@ use mergiraf::{
     newline::{imitate_cr_lf_from_input, normalize_to_lf},
     resolve_merge_cascading,
     settings::DisplaySettings,
-    PathBufExt,
-    DISABLING_ENV_VAR,
 };
 
 /// Syntax-aware merge driver for Git.
@@ -255,7 +255,9 @@ fn real_main(args: CliArgs) -> Result<i32, String> {
 
             if merge_result.conflict_count > 0 {
                 if old_git_detected {
-                    warn!("Using Git v2.44.0 or above is recommended to get meaningful revision names on conflict markers when using Mergiraf.");
+                    warn!(
+                        "Using Git v2.44.0 or above is recommended to get meaningful revision names on conflict markers when using Mergiraf."
+                    );
                 }
                 1
             } else {

src/bin/mergiraf.rs

@@ -7,7 +7,7 @@ use std::{
 };
 
 use rand::distr::{Alphanumeric, SampleString};
-use zip::{write::SimpleFileOptions, ZipWriter};
+use zip::{ZipWriter, write::SimpleFileOptions};
 
 use crate::{attempts::AttemptsCache, git::extract_revision_from_git, pcs::Revision};
 

src/bug_reporter.rs

@@ -5,7 +5,7 @@ use itertools::Itertools;
 use crate::{
     class_mapping::{ClassMapping, RevNode},
     multimap::MultiMap,
-    pcs::{PCSNode, Revision, PCS},
+    pcs::{PCS, PCSNode, Revision},
     tree::{Ast, AstNode},
 };
 
@@ -130,7 +130,7 @@ impl<'a> ChangeSet<'a> {
     pub(crate) fn other_successors<'s, 'b>(
         &'s self,
         pcs: &'b PCS<'a>,
-    ) -> impl Iterator<Item = &'s PCS<'a>> + use<'s, 'a, 'b> {
+    ) -> impl Iterator<Item = &'s PCS<'a>> {
         self.parents.get(&pcs.parent).iter().filter(move |other| {
             other.successor != pcs.successor && other.predecessor == pcs.predecessor
         })
@@ -140,7 +140,7 @@ impl<'a> ChangeSet<'a> {
     pub fn inconsistent_triples<'s, 'b>(
         &'s self,
         pcs: &'b PCS<'a>,
-    ) -> impl Iterator<Item = &'s PCS<'a>> + use<'s, 'a, 'b> {
+    ) -> impl Iterator<Item = &'s PCS<'a>> {
         self.parents
             .get(&pcs.parent)
             .iter()

src/changeset.rs

@@ -59,12 +59,12 @@ use git::extract_revision_from_git;
 use itertools::Itertools;
 use lang_profile::LangProfile;
 use line_based::{
-    line_based_merge, line_based_merge_with_duplicate_signature_detection, LINE_BASED_METHOD,
+    LINE_BASED_METHOD, line_based_merge, line_based_merge_with_duplicate_signature_detection,
 };
 use log::{debug, info, warn};
 
 use merge_result::MergeResult;
-use parsed_merge::{ParsedMerge, PARSED_MERGE_DIFF2_DETECTED};
+use parsed_merge::{PARSED_MERGE_DIFF2_DETECTED, ParsedMerge};
 use pcs::Revision;
 use settings::DisplaySettings;
 use structured::structured_merge;
@@ -425,9 +425,13 @@ pub fn resolve_merge_cascading<'a>(
             if err == PARSED_MERGE_DIFF2_DETECTED {
                 // if parsing the original merge failed because it's done in diff2 mode,
                 // then we warn the user about it but don't give up yet as we can try a full merge
-                warn!("Cannot solve conflicts in diff2 style. Merging the original conflict sides from scratch instead.");
+                warn!(
+                    "Cannot solve conflicts in diff2 style. Merging the original conflict sides from scratch instead."
+                );
             } else {
-                warn!("Error while parsing conflicts: {err}. Merging the original conflict sides from scratch instead.");
+                warn!(
+                    "Error while parsing conflicts: {err}. Merging the original conflict sides from scratch instead."
+                );
             }
         }
         Ok(parsed_merge) => {

src/lib.rs

@@ -1,4 +1,4 @@
-use crate::{parse, pcs::Revision, MergeResult, TSParser};
+use crate::{MergeResult, TSParser, parse, pcs::Revision};
 use diffy_imara::{Algorithm, ConflictStyle, MergeOptions};
 use typed_arena::Arena;
 

src/line_based.rs

@@ -115,7 +115,7 @@ impl<'tree> Matching<'tree> {
     }
 
     /// Retrieve match ids from left to right
-    pub fn as_ids<'s>(&'s self) -> impl Iterator<Item = (usize, usize)> + use<'s, 'tree> {
+    pub fn as_ids(&self) -> impl Iterator<Item = (usize, usize)> {
         self.left_to_right
             .iter()
             .map(|(source, target)| (source.id, target.id))

src/matching.rs

@@ -441,7 +441,11 @@ impl<'a> MergedTree<'a> {
                 });
 
                 let (preceding_whitespace, indentation_shift) = match whitespaces {
-                    [Some(whitespace_left), Some(whitespace_right), Some(whitespace_base)] => {
+                    [
+                        Some(whitespace_left),
+                        Some(whitespace_right),
+                        Some(whitespace_base),
+                    ] => {
                         if whitespace_base == whitespace_left {
                             whitespace_right
                         } else {

src/merged_tree.rs

@@ -4,14 +4,14 @@ use log::debug;
 use typed_arena::Arena;
 
 use crate::{
+    MergeResult, Revision, TSParser,
     lang_profile::LangProfile,
     line_based::{FULLY_STRUCTURED_METHOD, STRUCTURED_RESOLUTION_METHOD},
     merge_3dm::three_way_merge,
     parse,
     parsed_merge::ParsedMerge,
     settings::DisplaySettings,
     tree_matcher::TreeMatcher,
-    MergeResult, Revision, TSParser,
 };
 
 /// Performs a fully structured merge, parsing the contents of all three revisions,

src/structured.rs

@@ -3,8 +3,8 @@ use std::sync::LazyLock;
 use crate::{
     lang_profile::{CommutativeParent, LangProfile},
     signature::{
-        signature,
         PathStep::{ChildType, Field},
+        signature,
     },
 };
 

src/supported_langs.rs

@@ -583,7 +583,7 @@ impl<'a, 'b> TreeBuilder<'a, 'b> {
         trimmed_sep: &'c str,
         trimmed_left_delim: &'c str,
         trimmed_right_delim: &'c str,
-    ) -> impl Iterator<Item = Leader<'a>> + use<'a, 'c> {
+    ) -> impl Iterator<Item = Leader<'a>> {
         slice
             .iter()
             .filter(move |n| {
@@ -600,7 +600,7 @@ impl<'a, 'b> TreeBuilder<'a, 'b> {
     fn find_separators_with_whitespace<'s>(
         slice: &'s [&'a AstNode<'a>],
         trimmed_sep: &'s str,
-    ) -> impl Iterator<Item = &'a str> + use<'a, 's> {
+    ) -> impl Iterator<Item = &'a str> {
         if trimmed_sep.is_empty() {
             Either::Left(
                 slice
@@ -1123,10 +1123,12 @@ mod tests {
             class_mapping.map_to_leader(RevNode::new(Revision::Base, tree.root())),
             &class_mapping
         ));
-        assert!(result_tree.contains(
-            class_mapping
-                .map_to_leader(RevNode::new(Revision::Base, tree.root().child(0).unwrap())),
-            &class_mapping
-        ));
+        assert!(
+            result_tree.contains(
+                class_mapping
+                    .map_to_leader(RevNode::new(Revision::Base, tree.root().child(0).unwrap())),
+                &class_mapping
+            )
+        );
     }
 }

src/tree_builder.rs

@@ -1,12 +1,12 @@
 use itertools::Itertools;
 use log::debug;
 use std::{
-    cmp::{min, Ordering},
+    cmp::{Ordering, min},
     collections::HashSet,
     fmt::Display,
     time::Instant,
 };
-use tree_edit_distance::{diff, Edit};
+use tree_edit_distance::{Edit, diff};
 use typed_arena::Arena;
 
 use crate::{

src/tree_matcher.rs

@@ -67,19 +67,28 @@ pub fn matching_to_graph<'a>(
 
     for (source_id, target_id) in mapping.exact.as_ids() {
         if visited_left.contains(&source_id) && visited_right.contains(&target_id) {
-            writeln!(writer, "  {left_prefix}{source_id} -- {right_prefix}{target_id} [color={COLOR_EXACT_MATCHING},constraint=false]")?;
+            writeln!(
+                writer,
+                "  {left_prefix}{source_id} -- {right_prefix}{target_id} [color={COLOR_EXACT_MATCHING},constraint=false]"
+            )?;
         }
     }
 
     for (source_id, target_id) in mapping.container.as_ids() {
         if visited_left.contains(&source_id) && visited_right.contains(&target_id) {
-            writeln!(writer, "  {left_prefix}{source_id} -- {right_prefix}{target_id} [color={COLOR_CONTAINER_MATCHING},constraint=false]")?;
+            writeln!(
+                writer,
+                "  {left_prefix}{source_id} -- {right_prefix}{target_id} [color={COLOR_CONTAINER_MATCHING},constraint=false]"
+            )?;
         }
     }
 
     for (source_id, target_id) in mapping.recovery.as_ids() {
         if visited_left.contains(&source_id) && visited_right.contains(&target_id) {
-            writeln!(writer, "  {left_prefix}{source_id} -- {right_prefix}{target_id} [color={COLOR_RECOVERY_MATCHING},constraint=false]")?;
+            writeln!(
+                writer,
+                "  {left_prefix}{source_id} -- {right_prefix}{target_id} [color={COLOR_RECOVERY_MATCHING},constraint=false]"
+            )?;
         }
     }
     writeln!(writer, "}}")?;

src/visualizer.rs

@@ -2,9 +2,9 @@ use std::fs;
 use std::path::{Path, PathBuf};
 use std::time::Duration;
 
-use diffy_imara::{create_patch, PatchFormatter};
+use diffy_imara::{PatchFormatter, create_patch};
 use mergiraf::settings::DisplaySettings;
-use mergiraf::{line_merge_and_structured_resolution, PathBufExt};
+use mergiraf::{PathBufExt, line_merge_and_structured_resolution};
 use rstest::rstest;
 
 mod common;

tests/integration_tests.rs

@@ -4,7 +4,7 @@ use std::process::Command;
 
 use mergiraf::newline::normalize_to_lf;
 use mergiraf::settings::DisplaySettings;
-use mergiraf::{resolve_merge_cascading, DISABLING_ENV_VAR};
+use mergiraf::{DISABLING_ENV_VAR, resolve_merge_cascading};
 use rstest::rstest;
 
 mod common;

tests/solve_command.rs

@@ -2,10 +2,10 @@ use std::fs::{self};
 use std::path::Path;
 use std::time::Duration;
 
-use diffy_imara::{create_patch, PatchFormatter};
+use diffy_imara::{PatchFormatter, create_patch};
 use mergiraf::line_based::line_based_merge;
 use mergiraf::settings::DisplaySettings;
-use mergiraf::{line_merge_and_structured_resolution, PathBufExt};
+use mergiraf::{PathBufExt, line_merge_and_structured_resolution};
 
 #[test]
 fn timeout_support() {