Migrate to Rust 2024 edition

Author: AmrDeveloper

Cargo.lock

@@ -2,7 +2,7 @@
 name = "gitql"
 authors = ["AmrDeveloper"]
 version = "0.40.0"
-edition = "2021"
+edition = "2024"
 description = "A SQL like query language to perform queries on .git files"
 license = "MIT"
 repository = "https://github.com/amrdeveloper/gql/"
@@ -25,18 +25,18 @@ members = [
 [workspace.dependencies]
 gix = { version = "0.73.0", default-features = false }
 dyn-clone = { version = "1.0.20" }
-comfy-table = { version = "7.1.4" }
+comfy-table = { version = "7.2.1" }
 termcolor = { version = "1.4.1" }
-serde_json = { version = "1.0.142" }
+serde_json = { version = "1.0.145" }
 csv = { version = "1.3.1" }
 yaml-rust = { version = "0.4.5" }
-chrono = { version = "0.4.41" }
-regex = { version = "1.11.1" }
+chrono = { version = "0.4.42" }
+regex = { version = "1.11.3" }
 rand = { version = "0.9.2" }
-indexmap = { version = "2.10.0" }
+indexmap = { version = "2.11.4" }
 phf = { version = "0.13.1" }
 linked-hash-map = { version = "0.5.6" }
-uuid = { version = "1.17.0", features = ["v4"] }
+uuid = { version = "1.18.1", features = ["v4"] }
 gitql-core = { path = "./crates/gitql-core", version = "0.17.0" }
 gitql-std = { path = "./crates/gitql-std", version = "0.17.0" }
 gitql-ast = { path = "./crates/gitql-ast", version = "0.36.0" }

Cargo.toml

@@ -1,8 +1,8 @@
 use std::hint::black_box;
 
+use criterion::Criterion;
 use criterion::criterion_group;
 use criterion::criterion_main;
-use criterion::Criterion;
 use gitql_parser::tokenizer::Tokenizer;
 
 const QUERY_100_CHAR: &str = "SELECT name, COUNT(name) FROM commits GROUP BY name, author_email ORDER BY commit_num DESC LIMIT 100";

benches/benchmarks.rs

@@ -3,8 +3,8 @@ use std::collections::HashMap;
 use gitql_ast::types::text::TextType;
 use gitql_core::signature::Signature;
 use gitql_core::signature::StandardFunction;
-use gitql_core::values::text::TextValue;
 use gitql_core::values::Value;
+use gitql_core::values::text::TextValue;
 
 #[inline(always)]
 pub(crate) fn register_commits_functions(map: &mut HashMap<&'static str, StandardFunction>) {

src/gitql/functions/commits.rs

@@ -7,11 +7,11 @@ use gitql_ast::types::integer::IntType;
 use gitql_ast::types::text::TextType;
 use gitql_core::signature::Signature;
 use gitql_core::signature::StandardFunction;
+use gitql_core::values::Value;
 use gitql_core::values::array::ArrayValue;
 use gitql_core::values::boolean::BoolValue;
 use gitql_core::values::integer::IntValue;
 use gitql_core::values::text::TextValue;
-use gitql_core::values::Value;
 
 use crate::gitql::types::diff_changes::DiffChangesType;
 use crate::gitql::values::diff_changes::DiffChangeKind;

src/gitql/functions/diffs.rs

@@ -1,12 +1,12 @@
 use std::convert::Infallible;
 
 use gitql_core::object::Row;
+use gitql_core::values::Value;
 use gitql_core::values::boolean::BoolValue;
 use gitql_core::values::datetime::DateTimeValue;
 use gitql_core::values::integer::IntValue;
 use gitql_core::values::null::NullValue;
 use gitql_core::values::text::TextValue;
-use gitql_core::values::Value;
 use gitql_engine::data_provider::DataProvider;
 
 use gix::diff::blob::pipeline::Mode;
@@ -227,11 +227,11 @@ fn select_branches(
             }
 
             if column_name == "commit_count" {
-                if let Some(id) = branch.try_id() {
-                    if let Ok(walker) = id.ancestors().all() {
-                        values.push(Box::new(IntValue::new(walker.count() as i64)));
-                        continue;
-                    }
+                if let Some(id) = branch.try_id()
+                    && let Ok(walker) = id.ancestors().all()
+                {
+                    values.push(Box::new(IntValue::new(walker.count() as i64)));
+                    continue;
                 }
                 values.push(Box::new(IntValue::new_zero()));
                 continue;
@@ -316,31 +316,30 @@ fn select_diffs(repo: &gix::Repository, selected_columns: &[String]) -> Result<V
         let (mut insertions, mut removals, mut files_changed) = (0, 0, 0);
         let mut diff_changes: Vec<DiffChange> = vec![];
 
-        if should_calculate_diffs {
-            if let Some(parent) = commit_info
+        if should_calculate_diffs
+            && let Some(parent) = commit_info
                 .parent_ids()
                 .next()
                 .map(|id| id.object().unwrap().into_commit().tree().unwrap())
-            {
-                let current = commit.tree().unwrap();
-                rewrite_cache.clear_resource_cache_keep_allocation();
-                diff_cache.clear_resource_cache_keep_allocation();
-
-                if let Ok(mut changes) = current.changes() {
-                    let _ = changes.for_each_to_obtain_tree_with_cache(
-                        &parent,
-                        &mut rewrite_cache,
-                        |change| {
-                            files_changed += usize::from(change.entry_mode().is_no_tree());
-                            let diff_change =
-                                DiffChange::new_with_content(&change, &mut diff_cache, &repo);
-                            insertions += diff_change.insertions;
-                            removals += diff_change.removals;
-                            diff_changes.push(diff_change);
-                            Ok::<_, Infallible>(Default::default())
-                        },
-                    );
-                }
+        {
+            let current = commit.tree().unwrap();
+            rewrite_cache.clear_resource_cache_keep_allocation();
+            diff_cache.clear_resource_cache_keep_allocation();
+
+            if let Ok(mut changes) = current.changes() {
+                let _ = changes.for_each_to_obtain_tree_with_cache(
+                    &parent,
+                    &mut rewrite_cache,
+                    |change| {
+                        files_changed += usize::from(change.entry_mode().is_no_tree());
+                        let diff_change =
+                            DiffChange::new_with_content(&change, &mut diff_cache, &repo);
+                        insertions += diff_change.insertions;
+                        removals += diff_change.removals;
+                        diff_changes.push(diff_change);
+                        Ok::<_, Infallible>(Default::default())
+                    },
+                );
             }
         }
 

src/gitql/gitql_data_provider.rs

@@ -1,7 +1,3 @@
-use lineeditor::event::LineEditorEvent;
-use lineeditor::keybindings::KeyCombination;
-use lineeditor::style::Style;
-use lineeditor::styled_buffer::StyledBuffer;
 use lineeditor::Color;
 use lineeditor::Completer;
 use lineeditor::Highlighter;
@@ -11,6 +7,10 @@ use lineeditor::LineEditor;
 use lineeditor::Span;
 use lineeditor::StringPrompt;
 use lineeditor::Suggestion;
+use lineeditor::event::LineEditorEvent;
+use lineeditor::keybindings::KeyCombination;
+use lineeditor::style::Style;
+use lineeditor::styled_buffer::StyledBuffer;
 
 const GITQL_RESERVED_KEYWORDS: [&str; 57] = [
     "do",