Revert "Revert "chore: update to rust 1.86 (#2666)" (#2667)" (#2676)

This reverts commit 9d816d16db.
This commit is contained in:
Ellie Huxtable 2025-04-07 13:04:18 +01:00 committed by GitHub
parent 95c29b7859
commit 336447e7f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 9 additions and 9 deletions

View file

@ -7,7 +7,7 @@ exclude = ["ui/backend"]
[workspace.package]
version = "18.5.0-beta.2"
authors = ["Ellie Huxtable <ellie@atuin.sh>"]
rust-version = "1.85.1"
rust-version = "1.86"
license = "MIT"
homepage = "https://atuin.sh"
repository = "https://github.com/atuinsh/atuin"

View file

@ -74,7 +74,7 @@ impl Cmd {
store.delete(&name).await?;
} else {
eprintln!("Cannot delete '{name}': Alias not set.");
};
}
Ok(())
}

View file

@ -66,7 +66,7 @@ impl Cmd {
store.delete(&name).await?;
} else {
eprintln!("Cannot delete '{name}': Var not set.");
};
}
Ok(())
}

View file

@ -606,7 +606,7 @@ impl Cmd {
format,
} => {
let last = db.last().await?;
let last = last.as_ref().map(std::slice::from_ref).unwrap_or_default();
let last = last.as_slice();
let tz = timezone.unwrap_or(settings.timezone);
print_list(
last,

View file

@ -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<()> {

View file

@ -278,7 +278,7 @@ impl Cmd {
tz,
);
}
};
}
Ok(())
}
}

View file

@ -508,7 +508,7 @@ impl State {
self.scroll_down(scroll_len);
}
_ => {}
};
}
InputAction::Continue
}

View file

@ -32,7 +32,7 @@
fenix.packages.${system}.fromToolchainFile
{
file = ./rust-toolchain.toml;
sha256 = "sha256-Hn2uaQzRLidAWpfmRwSRdImifGUCAb9HeAqTYFXWeQk=";
sha256 = "sha256-X/4ZBHO3iW0fOenQ3foEvscgAPJYl2abspaBThDOukI=";
};
in
pkgs.makeRustPlatform {

View file

@ -1,2 +1,2 @@
[toolchain]
channel = "1.85.1"
channel = "1.86"