averello/atuin-mirror
1
0
Fork 0
mirror of https://github.com/atuinsh/atuin.git synced 2025-12-14 20:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: update to Rust 1.90 (#2916)

Browse Source 
<!-- 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
- [X] I am happy for maintainers to push small adjustments to this PR,
to speed up the review cycle
- [X] I have checked that there are no existing pull requests for the
same thing

Hopefully this one is mergeable as is, unlike the 1.89 upgrade.

Fixes: #2915
This commit is contained in:
Ray Kohler
2025-09-26 13:46:49 -04:00
committed by GitHub
parent 9b151b82e6
commit 65b25c4f82
10 changed files with 503 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/rust.yml vendored
View File

@@ -26,7 +26,7 @@ jobs:
- name: Install rust
uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.89
toolchain: 1.90
- uses: actions/cache@v4
with:
@@ -97,7 +97,7 @@ jobs:
- name: Install rust
uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.89
toolchain: 1.90
- 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.89
toolchain: 1.90
- uses: actions/cache@v4
with:
@@ -171,7 +171,7 @@ jobs:
- name: Install rust
uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.89
toolchain: 1.90
- 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.89
toolchain: 1.90
components: clippy
- uses: actions/cache@v4
@@ -223,7 +223,7 @@ jobs:
- name: Install latest rust
uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.89
toolchain: 1.90
components: rustfmt
- name: Format

830
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
Cargo.toml
View File

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

2
Dockerfile
View File

@@ -1,4 +1,4 @@
FROM lukemathwalker/cargo-chef:latest-rust-1.89.0-slim-bookworm AS chef
FROM lukemathwalker/cargo-chef:latest-rust-1.90.0-slim-bookworm AS chef
WORKDIR app
FROM chef AS planner

2
crates/atuin-common/src/lib.rs
View File

@@ -45,7 +45,7 @@ macro_rules! new_uuid {
fn encode_by_ref(
&self,
buf: &mut DB::ArgumentBuffer<'q>,
) -> Result<sqlx::encode::IsNull, Box<(dyn std::error::Error + Send + Sync + 'static)>>
) -> Result<sqlx::encode::IsNull, Box<dyn std::error::Error + Send + Sync + 'static>>
{
self.0.encode_by_ref(buf)
}

3
crates/atuin/src/command/client/doctor.rs
View File

@@ -251,7 +251,8 @@ impl SyncInfo {
cloud: settings.sync_address == "https://api.atuin.sh",
auto_sync: settings.auto_sync,
records: settings.sync.records,
last_sync: Settings::last_sync().map_or("no last sync".to_string(), |v| v.to_string()),
last_sync: Settings::last_sync()
.map_or_else(|_| "no last sync".to_string(), |v| v.to_string()),
}
}
}

4
crates/atuin/src/command/client/search/inspector.rs
View File

@@ -52,7 +52,7 @@ pub fn draw_commands(
stats
.previous
.clone()
.map_or("No previous command".to_string(), |prev| prev.command),
.map_or_else(|| "No previous command".to_string(), |prev| prev.command),
)
.block(
Block::new()
@@ -66,7 +66,7 @@ pub fn draw_commands(
stats
.next
.clone()
.map_or("No next command".to_string(), |next| next.command),
.map_or_else(|| "No next command".to_string(), |next| next.command),
)
.block(
Block::new()

24
flake.lock generated
View File

@@ -8,11 +8,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1742366221,
"narHash": "sha256-GhWGWyGUvTF7H2DDGlQehsve1vRqIKAFhxy6D82Nj3Q=",
"lastModified": 1758609765,
"narHash": "sha256-VIYu7R9Yc/CItjmzLSm21Lr9DgpEsKL5H+JUu8KDTn4=",
"owner": "nix-community",
"repo": "fenix",
"rev": "a074d1bc9fd34f6b3a9049c5a61a82aea2044801",
"rev": "05545a7f3cd5cd5628b195520758e56e6734b90a",
"type": "github"
},
"original": {
@@ -24,11 +24,11 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
@@ -57,11 +57,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1742272065,
"narHash": "sha256-ud8vcSzJsZ/CK+r8/v0lyf4yUntVmDq6Z0A41ODfWbE=",
"lastModified": 1758446476,
"narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3549532663732bfd89993204d40543e9edaec4f2",
"rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0",
"type": "github"
},
"original": {
@@ -82,11 +82,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1742296961,
"narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=",
"lastModified": 1758556272,
"narHash": "sha256-9amq6LAd0CFF3dLrJUItPiG64MQOG4QPrvjbjpa6NFc=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4",
"rev": "d05355db16dc526bb16bd84769ea840668d7015e",
"type": "github"
},
"original": {

2
flake.nix
View File

@@ -31,7 +31,7 @@
fenix.packages.${system}.fromToolchainFile
{
file = ./rust-toolchain.toml;
sha256 = "sha256-+9FmLhAOezBZCOziO0Qct1NOrfpjNsXxc/8I0c7BdKE=";
sha256 = "sha256-SJwZ8g0zF2WrKDVmHrVG3pD2RGoQeo24MEXnNx5FyuI=";
};
in
pkgs.makeRustPlatform {

2
rust-toolchain.toml
View File

@@ -1,2 +1,2 @@
[toolchain]
channel = "1.89"
channel = "1.90"