aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEllie Huxtable <ellie@atuin.sh>2026-01-26 12:07:55 -0800
committerGitHub <noreply@github.com>2026-01-26 12:07:55 -0800
commite8fe331587d288a35470ef5fcaf852aa706502ef (patch)
treeab1b7474595f3bd8e551c45fa7057136b2788e61
parentchore(deps): bump lukemathwalker/cargo-chef from latest-rust-1.92.0-slim-book... (diff)
parentclippy clappy (diff)
downloadatuin-e8fe331587d288a35470ef5fcaf852aa706502ef.zip
chore: update to rust 1.93 (#3101)
<!-- Thank you for making a PR! Bug fixes are always welcome, but if you're adding a new feature or changing an existing one, we'd really appreciate if you open an issue, post on the forum, or drop in on Discord --> ## Checks - [ ] I am happy for maintainers to push small adjustments to this PR, to speed up the review cycle - [ ] I have checked that there are no existing pull requests for the same thing
-rw-r--r--.github/workflows/rust.yml12
-rw-r--r--Cargo.toml2
-rw-r--r--crates/atuin/src/command/client/search.rs25
-rw-r--r--flake.nix2
-rw-r--r--rust-toolchain.toml2
5 files changed, 20 insertions, 23 deletions
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 4b8b2fa7..85d5e5d9 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -26,7 +26,7 @@ jobs:
- name: Install rust
uses: dtolnay/rust-toolchain@master
with:
- toolchain: 1.91
+ toolchain: 1.93
- uses: actions/cache@v4
with:
@@ -97,7 +97,7 @@ jobs:
- name: Install rust
uses: dtolnay/rust-toolchain@master
with:
- toolchain: 1.91
+ toolchain: 1.93
- uses: taiki-e/install-action@v2
name: Install nextest
@@ -127,7 +127,7 @@ jobs:
- name: Install rust
uses: dtolnay/rust-toolchain@master
with:
- toolchain: 1.91
+ toolchain: 1.93
- uses: actions/cache@v4
with:
@@ -171,7 +171,7 @@ jobs:
- name: Install rust
uses: dtolnay/rust-toolchain@master
with:
- toolchain: 1.91
+ toolchain: 1.93
- uses: taiki-e/install-action@v2
name: Install nextest
@@ -200,7 +200,7 @@ jobs:
- name: Install latest rust
uses: dtolnay/rust-toolchain@master
with:
- toolchain: 1.91
+ toolchain: 1.93
components: clippy
- uses: actions/cache@v4
@@ -223,7 +223,7 @@ jobs:
- name: Install latest rust
uses: dtolnay/rust-toolchain@master
with:
- toolchain: 1.91
+ toolchain: 1.93
components: rustfmt
- name: Format
diff --git a/Cargo.toml b/Cargo.toml
index ba706344..e1f75a62 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ exclude = ["ui/backend"]
[workspace.package]
version = "18.11.0"
authors = ["Ellie Huxtable <ellie@atuin.sh>"]
-rust-version = "1.91"
+rust-version = "1.93"
license = "MIT"
homepage = "https://atuin.sh"
repository = "https://github.com/atuinsh/atuin"
diff --git a/crates/atuin/src/command/client/search.rs b/crates/atuin/src/command/client/search.rs
index be00ee99..ceeb9436 100644
--- a/crates/atuin/src/command/client/search.rs
+++ b/crates/atuin/src/command/client/search.rs
@@ -150,20 +150,17 @@ impl Cmd {
store: SqliteStore,
theme: &Theme,
) -> Result<()> {
- let query = self.query.map_or_else(
- || {
- std::env::var("ATUIN_QUERY").map_or_else(
- |_| vec![],
- |query| {
- query
- .split(' ')
- .map(std::string::ToString::to_string)
- .collect()
- },
- )
- },
- |query| query,
- );
+ let query = self.query.unwrap_or_else(|| {
+ std::env::var("ATUIN_QUERY").map_or_else(
+ |_| vec![],
+ |query| {
+ query
+ .split(' ')
+ .map(std::string::ToString::to_string)
+ .collect()
+ },
+ )
+ });
if (self.delete_it_all || self.delete) && self.limit.is_some() {
// Because of how deletion is implemented, it will always delete all matches
diff --git a/flake.nix b/flake.nix
index 45ec70f6..64884c01 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,7 +31,7 @@
fenix.packages.${system}.fromToolchainFile
{
file = ./rust-toolchain.toml;
- sha256 = "sha256-SDu4snEWjuZU475PERvu+iO50Mi39KVjqCeJeNvpguU=";
+ sha256 = "sha256-vra6TkHITpwRyA5oBKAHSX0Mi6CBDNQD+ryPSpxFsfg=";
};
in
pkgs.makeRustPlatform {
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 1a35d664..79d20990 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
[toolchain]
-channel = "1.91"
+channel = "1.93"