From d829261a096bb5fb980bba17295c4239bb978432 Mon Sep 17 00:00:00 2001
From: Starnick4444 <nemes.bence1@gmail.com>
Date: Mon, 30 Jun 2025 22:19:02 +0200
Subject: [PATCH] chore(nix-daemon): upgrade to 2024 edition

Part of #114
This edition change doesn't affect this crate except for formatting.

Change-Id: I8e2650f6de776658a14ee5a11bc7a63ad57fae89
Reviewed-on: https://cl.snix.dev/c/snix/+/30591
Reviewed-by: Florian Klink <flokli@flokli.de>
Autosubmit: Bence Nemes <nemes.bence1@gmail.com>
Tested-by: besadii
---
 snix/Cargo.nix                        | 2 +-
 snix/nix-daemon/Cargo.toml            | 2 +-
 snix/nix-daemon/rustfmt.toml          | 2 ++
 snix/nix-daemon/src/bin/nix-daemon.rs | 2 +-
 snix/nix-daemon/src/lib.rs            | 4 ++--
 5 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 snix/nix-daemon/rustfmt.toml

diff --git a/snix/Cargo.nix b/snix/Cargo.nix
index 13290e835..7d64f2021 100644
--- a/snix/Cargo.nix
+++ b/snix/Cargo.nix
@@ -8495,7 +8495,7 @@ rec {
       "nix-daemon" = rec {
         crateName = "nix-daemon";
         version = "0.1.0";
-        edition = "2021";
+        edition = "2024";
         crateBin = [
           {
             name = "nix-daemon";
diff --git a/snix/nix-daemon/Cargo.toml b/snix/nix-daemon/Cargo.toml
index 66bb079c5..916cf3ea3 100644
--- a/snix/nix-daemon/Cargo.toml
+++ b/snix/nix-daemon/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "nix-daemon"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 async-trait = "0.1.83"
diff --git a/snix/nix-daemon/rustfmt.toml b/snix/nix-daemon/rustfmt.toml
new file mode 100644
index 000000000..4dfc1d2b7
--- /dev/null
+++ b/snix/nix-daemon/rustfmt.toml
@@ -0,0 +1,2 @@
+# FUTUREWORK: move to .. once all crates are migrated (#114)
+edition = "2024"
diff --git a/snix/nix-daemon/src/bin/nix-daemon.rs b/snix/nix-daemon/src/bin/nix-daemon.rs
index 8705f3505..e01c8465d 100644
--- a/snix/nix-daemon/src/bin/nix-daemon.rs
+++ b/snix/nix-daemon/src/bin/nix-daemon.rs
@@ -2,7 +2,7 @@ use clap::Parser;
 use mimalloc::MiMalloc;
 use nix_compat::nix_daemon::handler::NixDaemon;
 use nix_daemon::SnixDaemon;
-use snix_store::utils::{construct_services, ServiceUrlsGrpc};
+use snix_store::utils::{ServiceUrlsGrpc, construct_services};
 use std::{error::Error, sync::Arc};
 use tokio_listener::SystemOptions;
 use tracing::error;
diff --git a/snix/nix-daemon/src/lib.rs b/snix/nix-daemon/src/lib.rs
index 0e5d72e0f..4f0a1177e 100644
--- a/snix/nix-daemon/src/lib.rs
+++ b/snix/nix-daemon/src/lib.rs
@@ -5,11 +5,11 @@ use std::{
 
 use nix_compat::{
     nix_daemon::{
-        types::{AddToStoreNarRequest, UnkeyedValidPathInfo},
         NixDaemonIO,
+        types::{AddToStoreNarRequest, UnkeyedValidPathInfo},
     },
     nixbase32,
-    store_path::{build_ca_path, StorePath},
+    store_path::{StorePath, build_ca_path},
 };
 use snix_castore::{blobservice::BlobService, directoryservice::DirectoryService};
 use snix_store::{nar::ingest_nar_and_hash, path_info::PathInfo, pathinfoservice::PathInfoService};