From 9d816d16db233dd1aa477bfe1cc5a960e3c7b6c7 Mon Sep 17 00:00:00 2001
From: Ellie Huxtable <ellie@atuin.sh>
Date: Thu, 3 Apr 2025 13:40:37 +0100
Subject: Revert "chore: update to rust 1.86 (#2666)" (#2667)

This reverts commit f0e8cc753e8448d415ae90ad7774058c6c5d47f7.
---
 Cargo.toml                                            | 2 +-
 crates/atuin/src/command/client/dotfiles/alias.rs     | 2 +-
 crates/atuin/src/command/client/dotfiles/var.rs       | 2 +-
 crates/atuin/src/command/client/history.rs            | 2 +-
 crates/atuin/src/command/client/init.rs               | 2 +-
 crates/atuin/src/command/client/search.rs             | 2 +-
 crates/atuin/src/command/client/search/interactive.rs | 2 +-
 flake.nix                                             | 2 +-
 rust-toolchain.toml                                   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2d66e49c..40ab7308 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ exclude = ["ui/backend"]
 [workspace.package]
 version = "18.5.0-beta.2"
 authors = ["Ellie Huxtable <ellie@atuin.sh>"]
-rust-version = "1.86"
+rust-version = "1.85.1"
 license = "MIT"
 homepage = "https://atuin.sh"
 repository = "https://github.com/atuinsh/atuin"
diff --git a/crates/atuin/src/command/client/dotfiles/alias.rs b/crates/atuin/src/command/client/dotfiles/alias.rs
index 8b640ab0..a26a25e9 100644
--- a/crates/atuin/src/command/client/dotfiles/alias.rs
+++ b/crates/atuin/src/command/client/dotfiles/alias.rs
@@ -74,7 +74,7 @@ impl Cmd {
             store.delete(&name).await?;
         } else {
             eprintln!("Cannot delete '{name}': Alias not set.");
-        }
+        };
         Ok(())
     }
 
diff --git a/crates/atuin/src/command/client/dotfiles/var.rs b/crates/atuin/src/command/client/dotfiles/var.rs
index f4e0361d..5cb195ff 100644
--- a/crates/atuin/src/command/client/dotfiles/var.rs
+++ b/crates/atuin/src/command/client/dotfiles/var.rs
@@ -66,7 +66,7 @@ impl Cmd {
             store.delete(&name).await?;
         } else {
             eprintln!("Cannot delete '{name}': Var not set.");
-        }
+        };
 
         Ok(())
     }
diff --git a/crates/atuin/src/command/client/history.rs b/crates/atuin/src/command/client/history.rs
index bf156ca0..46c1565d 100644
--- a/crates/atuin/src/command/client/history.rs
+++ b/crates/atuin/src/command/client/history.rs
@@ -606,7 +606,7 @@ impl Cmd {
                 format,
             } => {
                 let last = db.last().await?;
-                let last = last.as_slice();
+                let last = last.as_ref().map(std::slice::from_ref).unwrap_or_default();
                 let tz = timezone.unwrap_or(settings.timezone);
                 print_list(
                     last,
diff --git a/crates/atuin/src/command/client/init.rs b/crates/atuin/src/command/client/init.rs
index 516ccd26..bfa97b93 100644
--- a/crates/atuin/src/command/client/init.rs
+++ b/crates/atuin/src/command/client/init.rs
@@ -100,7 +100,7 @@ $env.config = (
             Shell::Xonsh => {
                 xonsh::init_static(self.disable_up_arrow, self.disable_ctrl_r);
             }
-        }
+        };
     }
 
     async fn dotfiles_init(&self, settings: &Settings) -> Result<()> {
diff --git a/crates/atuin/src/command/client/search.rs b/crates/atuin/src/command/client/search.rs
index 8c864e77..7298209b 100644
--- a/crates/atuin/src/command/client/search.rs
+++ b/crates/atuin/src/command/client/search.rs
@@ -278,7 +278,7 @@ impl Cmd {
                     tz,
                 );
             }
-        }
+        };
         Ok(())
     }
 }
diff --git a/crates/atuin/src/command/client/search/interactive.rs b/crates/atuin/src/command/client/search/interactive.rs
index 0fd7cbb6..c310f64d 100644
--- a/crates/atuin/src/command/client/search/interactive.rs
+++ b/crates/atuin/src/command/client/search/interactive.rs
@@ -508,7 +508,7 @@ impl State {
                 self.scroll_down(scroll_len);
             }
             _ => {}
-        }
+        };
 
         InputAction::Continue
     }
diff --git a/flake.nix b/flake.nix
index adca7b34..3772a7d8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,7 +32,7 @@
                 fenix.packages.${system}.fromToolchainFile
                   {
                     file = ./rust-toolchain.toml;
-                    sha256 = "sha256-X/4ZBHO3iW0fOenQ3foEvscgAPJYl2abspaBThDOukI=";
+                    sha256 = "sha256-Hn2uaQzRLidAWpfmRwSRdImifGUCAb9HeAqTYFXWeQk=";
                   };
             in
             pkgs.makeRustPlatform {
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index e7f22fb8..00822fdf 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.86"
+channel = "1.85.1"
-- 
cgit v1.3.1