aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEllie Huxtable <ellie@atuin.sh>2026-02-12 15:54:25 -0800
committerGitHub <noreply@github.com>2026-02-12 15:54:25 -0800
commit40c09d554af1fbc4d44f616ae6ed28c26b478e08 (patch)
treefd059fef51190effe263121307e749055575abef
parentfix: multiline commands with fish (#3179) (diff)
downloadatuin-40c09d554af1fbc4d44f616ae6ed28c26b478e08.zip
chore(deps): update to rust 1.93.1 (#3181)
Resolves breaking checks on `main` ## 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--AGENTS.md2
-rw-r--r--Cargo.toml2
-rw-r--r--Dockerfile2
-rw-r--r--flake.nix2
-rw-r--r--rust-toolchain.toml2
6 files changed, 11 insertions, 11 deletions
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 4f391240..c7f5ae01 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.93
+ toolchain: 1.93.1
- uses: actions/cache@v5
with:
@@ -97,7 +97,7 @@ jobs:
- name: Install rust
uses: dtolnay/rust-toolchain@master
with:
- toolchain: 1.93
+ toolchain: 1.93.1
- 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.93
+ toolchain: 1.93.1
- uses: actions/cache@v5
with:
@@ -171,7 +171,7 @@ jobs:
- name: Install rust
uses: dtolnay/rust-toolchain@master
with:
- toolchain: 1.93
+ toolchain: 1.93.1
- 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.93
+ toolchain: 1.93.1
components: clippy
- uses: actions/cache@v5
@@ -223,7 +223,7 @@ jobs:
- name: Install latest rust
uses: dtolnay/rust-toolchain@master
with:
- toolchain: 1.93
+ toolchain: 1.93.1
components: rustfmt
- name: Format
diff --git a/AGENTS.md b/AGENTS.md
index 82cad0de..4aba8ed2 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -41,7 +41,7 @@ atuin-server-sqlite SQLite implementation (sqlx)
## Conventions
-- Rust 2024 edition, toolchain 1.93.
+- Rust 2024 edition, toolchain 1.93.1.
- Errors: `eyre::Result` in binaries, `thiserror` for typed errors in libraries.
- Async: tokio. Client uses `current_thread`; server uses `multi_thread`.
- `#![deny(unsafe_code)]` on client/common, `#![forbid(unsafe_code)]` on server.
diff --git a/Cargo.toml b/Cargo.toml
index a960ca84..a394d400 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ exclude = ["ui/backend"]
[workspace.package]
version = "18.12.1"
authors = ["Ellie Huxtable <ellie@atuin.sh>"]
-rust-version = "1.93"
+rust-version = "1.93.1"
license = "MIT"
homepage = "https://atuin.sh"
repository = "https://github.com/atuinsh/atuin"
diff --git a/Dockerfile b/Dockerfile
index 57cc11c7..49a7a907 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM lukemathwalker/cargo-chef:latest-rust-1.93.0-slim-bookworm AS chef
+FROM lukemathwalker/cargo-chef:latest-rust-1.93.1-slim-bookworm AS chef
WORKDIR app
FROM chef AS planner
diff --git a/flake.nix b/flake.nix
index 64884c01..06cfb4bf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,7 +31,7 @@
fenix.packages.${system}.fromToolchainFile
{
file = ./rust-toolchain.toml;
- sha256 = "sha256-vra6TkHITpwRyA5oBKAHSX0Mi6CBDNQD+ryPSpxFsfg=";
+ sha256 = "sha256-SBKjxhC6zHTu0SyJwxLlQHItzMzYZ71VCWQC2hOzpRY=";
};
in
pkgs.makeRustPlatform {
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 79d20990..53551330 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
[toolchain]
-channel = "1.93"
+channel = "1.93.1"