From c50136141205b72f8c131055c9ea945a1c026334 Mon Sep 17 00:00:00 2001
From: Starnick4444 <nemes.bence1@gmail.com>
Date: Wed, 30 Apr 2025 23:19:46 +0200
Subject: [PATCH] chore(cli): upgrade cli to 2024 edition

Part of #114
cli doesn't contain any unsafe

Change-Id: I65b573be5f9ff5c93b813a930df908d6aea6c799
Reviewed-on: https://cl.snix.dev/c/snix/+/30365
Tested-by: besadii
Reviewed-by: Florian Klink <flokli@flokli.de>
---
 snix/Cargo.nix        | 2 +-
 snix/cli/Cargo.toml   | 2 +-
 snix/cli/rustfmt.toml | 2 ++
 snix/cli/src/lib.rs   | 4 ++--
 snix/cli/src/main.rs  | 4 ++--
 snix/cli/src/repl.rs  | 6 +++---
 6 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 snix/cli/rustfmt.toml

diff --git a/snix/Cargo.nix b/snix/Cargo.nix
index 38d9667e6..ad1df92fe 100644
--- a/snix/Cargo.nix
+++ b/snix/Cargo.nix
@@ -14029,7 +14029,7 @@ rec {
       "snix-cli" = rec {
         crateName = "snix-cli";
         version = "0.1.0";
-        edition = "2021";
+        edition = "2024";
         crateBin = [
           {
             name = "snix";
diff --git a/snix/cli/Cargo.toml b/snix/cli/Cargo.toml
index 44ec49f16..4672a788e 100644
--- a/snix/cli/Cargo.toml
+++ b/snix/cli/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "snix-cli"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [[bin]]
 name = "snix"
diff --git a/snix/cli/rustfmt.toml b/snix/cli/rustfmt.toml
new file mode 100644
index 000000000..4dfc1d2b7
--- /dev/null
+++ b/snix/cli/rustfmt.toml
@@ -0,0 +1,2 @@
+# FUTUREWORK: move to .. once all crates are migrated (#114)
+edition = "2024"
diff --git a/snix/cli/src/lib.rs b/snix/cli/src/lib.rs
index 5e9e347cd..2fdeeed3b 100644
--- a/snix/cli/src/lib.rs
+++ b/snix/cli/src/lib.rs
@@ -5,9 +5,9 @@ use rustc_hash::FxHashMap;
 use smol_str::SmolStr;
 use snix_build::buildservice;
 use snix_eval::{
+    ErrorKind, EvalIO, EvalMode, GlobalsMap, SourceCode, Value,
     builtins::impure_builtins,
     observer::{DisassemblingObserver, TracingObserver},
-    ErrorKind, EvalIO, EvalMode, GlobalsMap, SourceCode, Value,
 };
 use snix_glue::{
     builtins::{add_derivation_builtins, add_fetcher_builtins, add_import_builtins},
@@ -16,7 +16,7 @@ use snix_glue::{
     snix_store_io::SnixStoreIO,
 };
 use std::fmt::Write;
-use tracing::{info_span, Span};
+use tracing::{Span, info_span};
 use tracing_indicatif::span_ext::IndicatifSpanExt;
 
 pub mod args;
diff --git a/snix/cli/src/main.rs b/snix/cli/src/main.rs
index 3265d2fcb..423c156df 100644
--- a/snix/cli/src/main.rs
+++ b/snix/cli/src/main.rs
@@ -2,9 +2,9 @@ use clap::Parser;
 use mimalloc::MiMalloc;
 use snix_cli::args::Args;
 use snix_cli::repl::Repl;
-use snix_cli::{init_io_handle, interpret, AllowIncomplete};
-use snix_eval::observer::DisassemblingObserver;
+use snix_cli::{AllowIncomplete, init_io_handle, interpret};
 use snix_eval::EvalMode;
+use snix_eval::observer::DisassemblingObserver;
 use snix_glue::snix_store_io::SnixStoreIO;
 use std::io::Write;
 use std::rc::Rc;
diff --git a/snix/cli/src/repl.rs b/snix/cli/src/repl.rs
index 6db578a3d..e6b261172 100644
--- a/snix/cli/src/repl.rs
+++ b/snix/cli/src/repl.rs
@@ -3,14 +3,14 @@ use std::path::PathBuf;
 use std::rc::Rc;
 
 use rustc_hash::FxHashMap;
-use rustyline::{error::ReadlineError, Editor};
+use rustyline::{Editor, error::ReadlineError};
 use smol_str::SmolStr;
 use snix_eval::{GlobalsMap, SourceCode, Value};
 use snix_glue::snix_store_io::SnixStoreIO;
 
 use crate::{
-    assignment::Assignment, evaluate, interpret, AllowIncomplete, Args, IncompleteInput,
-    InterpretResult,
+    AllowIncomplete, Args, IncompleteInput, InterpretResult, assignment::Assignment, evaluate,
+    interpret,
 };
 
 fn state_dir() -> Option<PathBuf> {