diff --git a/Cargo.toml b/Cargo.toml index e92fa380d0b..a1c7391869b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ exclude = ["ui/backend"] [workspace.package] version = "18.4.0-beta.3" authors = ["Ellie Huxtable "] -rust-version = "1.79" +rust-version = "1.80" license = "MIT" homepage = "https://atuin.sh" repository = "https://github.com/atuinsh/atuin" diff --git a/crates/atuin/src/command/client/search/interactive.rs b/crates/atuin/src/command/client/search/interactive.rs index 777ec257fc2..fae39e28337 100644 --- a/crates/atuin/src/command/client/search/interactive.rs +++ b/crates/atuin/src/command/client/search/interactive.rs @@ -764,7 +764,7 @@ impl State { ); } - fn build_title(&mut self, theme: &Theme) -> Paragraph { + fn build_title(&self, theme: &Theme) -> Paragraph { let title = if self.update_needed.is_some() { let error_style: Style = theme.get_error().into(); Paragraph::new(Text::from(Span::styled( @@ -820,7 +820,7 @@ impl State { .alignment(Alignment::Center) } - fn build_stats(&mut self, theme: &Theme) -> Paragraph { + fn build_stats(&self, theme: &Theme) -> Paragraph { let stats = Paragraph::new(Text::from(Span::raw(format!( "history count: {}", self.history_count, @@ -863,7 +863,7 @@ impl State { } } - fn build_input(&mut self, style: StyleState) -> Paragraph { + fn build_input(&self, style: StyleState) -> Paragraph { /// Max width of the UI box showing current mode const MAX_WIDTH: usize = 14; let (pref, mode) = if self.switched_search_mode { @@ -895,7 +895,7 @@ impl State { } fn build_preview( - &mut self, + &self, results: &[History], compact: bool, preview_width: u16, diff --git a/flake.lock b/flake.lock index 751807219f8..1d804726757 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1722407091, - "narHash": "sha256-+xR0ZqooQvAjxcpoDBCqiUCKrBK8/RGVffRzlKH7urw=", + "lastModified": 1722839439, + "narHash": "sha256-AwQv9kstzEOYjzuC9uY8jECqFJPuV/UxPLa30L3DLqo=", "owner": "nix-community", "repo": "fenix", - "rev": "0900ff903f376cc822ca637fef58c1ca4f44fab5", + "rev": "1388e72dd8562c8b2908fd655dee0c797df9e930", "type": "github" }, "original": { @@ -57,11 +57,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722415718, - "narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=", + "lastModified": 1722730825, + "narHash": "sha256-X6U+w8qFBuGPCYrZzc9mpN34aRjQ8604MonpBUkj908=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3392ad349a5227f4a3464dce87bcc5046692fce", + "rev": "f3834de3782b82bfc666abf664f946d0e7d1f116", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1722337341, - "narHash": "sha256-Myc+UnbLDQccueeO1q5CF0sNiGebQo1N+cdOpDMhNsg=", + "lastModified": 1722798820, + "narHash": "sha256-/Bd0VzlutcxTwSNouS/iC6BDv395NoO4XmBJaS2vQLg=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "4feec4b0c1d5aad7aba34e0397fe7bd984c9a634", + "rev": "c9109f23de57359df39db6fa36b5ca4c64b671e1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7a91963a076..013ef3b2e56 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,7 @@ fenix.packages.${system}.fromToolchainFile { file = ./rust-toolchain.toml; - sha256 = "sha256-Ngiz76YP4HTY75GGdH2P+APE/DEIx2R/Dn+BwwOyzZU="; + sha256 = "sha256-6eN/GKzjVSjEhGO9FhWObkRFaE1Jf+uqMSdQnb8lcB4="; }; in pkgs.makeRustPlatform { diff --git a/rust-toolchain.toml b/rust-toolchain.toml index c6e4d7d5031..8cca5be0594 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.79" +channel = "1.80"