From 14ec768b4520d4fc34dbf24e663ea7db940c18b7 Mon Sep 17 00:00:00 2001
From: Ellie Huxtable <ellie@atuin.sh>
Date: Wed, 19 Mar 2025 12:44:20 +0000
Subject: chore: migrate to rust 2024 (#2635)

* chore: upgrade to 2024 edition

* ugh unsafe

* format

* nixxxxxxxxxxx why
---
 crates/atuin-daemon/src/client.rs      | 2 +-
 crates/atuin-daemon/src/server.rs      | 8 +++++---
 crates/atuin-daemon/src/server/sync.rs | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'crates/atuin-daemon/src')

diff --git a/crates/atuin-daemon/src/client.rs b/crates/atuin-daemon/src/client.rs
index 110fd01a..72272c01 100644
--- a/crates/atuin-daemon/src/client.rs
+++ b/crates/atuin-daemon/src/client.rs
@@ -12,7 +12,7 @@ use tokio::net::UnixStream;
 use atuin_client::history::History;
 
 use crate::history::{
-    history_client::HistoryClient as HistoryServiceClient, EndHistoryRequest, StartHistoryRequest,
+    EndHistoryRequest, StartHistoryRequest, history_client::HistoryClient as HistoryServiceClient,
 };
 
 pub struct HistoryClient {
diff --git a/crates/atuin-daemon/src/server.rs b/crates/atuin-daemon/src/server.rs
index c9f97a65..efed0ee3 100644
--- a/crates/atuin-daemon/src/server.rs
+++ b/crates/atuin-daemon/src/server.rs
@@ -7,13 +7,13 @@ use atuin_client::settings::Settings;
 use std::path::PathBuf;
 use std::sync::Arc;
 use time::OffsetDateTime;
-use tracing::{instrument, Level};
+use tracing::{Level, instrument};
 
 use atuin_client::database::{Database, Sqlite as HistoryDatabase};
 use atuin_client::history::{History, HistoryId};
 use dashmap::DashMap;
 use eyre::Result;
-use tonic::{transport::Server, Request, Response, Status};
+use tonic::{Request, Response, Status, transport::Server};
 
 use crate::history::history_server::{History as HistorySvc, HistoryServer};
 
@@ -194,7 +194,9 @@ async fn start_server(settings: Settings, history: HistoryService) -> Result<()>
                     }
                 }
                 Err(err) => {
-                    tracing::warn!("could not detect systemd socket path, ensure that it's at the configured path: {socket_path:?}, error: {err:?}");
+                    tracing::warn!(
+                        "could not detect systemd socket path, ensure that it's at the configured path: {socket_path:?}, error: {err:?}"
+                    );
                 }
             }
             (UnixListener::from_std(listener)?, false)
diff --git a/crates/atuin-daemon/src/server/sync.rs b/crates/atuin-daemon/src/server/sync.rs
index 0724a250..3aa5dec3 100644
--- a/crates/atuin-daemon/src/server/sync.rs
+++ b/crates/atuin-daemon/src/server/sync.rs
@@ -10,7 +10,7 @@ use atuin_client::{
     settings::Settings,
 };
 
-use atuin_dotfiles::store::{var::VarStore, AliasStore};
+use atuin_dotfiles::store::{AliasStore, var::VarStore};
 
 pub async fn worker(
     settings: Settings,
-- 
cgit v1.3.1