extern/atuin
1
0
Fork 0
mirror of https://github.com/atuinsh/atuin.git synced 2024-11-22 00:03:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: update to rust 1.80 (#2344)

Browse Source
This commit is contained in:
Ellie Huxtable 2024-08-07 21:07:34 +01:00 committed by GitHub
parent 58c904996d
commit b764ee327d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

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

8
crates/atuin/src/command/client/search/interactive.rs
View File

@ -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 title = if self.update_needed.is_some() {
let error_style: Style = theme.get_error().into(); let error_style: Style = theme.get_error().into();
Paragraph::new(Text::from(Span::styled( Paragraph::new(Text::from(Span::styled(
@ -820,7 +820,7 @@ impl State {
.alignment(Alignment::Center) .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!( let stats = Paragraph::new(Text::from(Span::raw(format!(
"history count: {}", "history count: {}",
self.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 /// Max width of the UI box showing current mode
const MAX_WIDTH: usize = 14; const MAX_WIDTH: usize = 14;
let (pref, mode) = if self.switched_search_mode { let (pref, mode) = if self.switched_search_mode {
@ -895,7 +895,7 @@ impl State {
} }
fn build_preview( fn build_preview(
&mut self, &self,
results: &[History], results: &[History],
compact: bool, compact: bool,
preview_width: u16, preview_width: u16,

18
flake.lock
View File

@ -8,11 +8,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1722407091, "lastModified": 1722839439,
"narHash": "sha256-+xR0ZqooQvAjxcpoDBCqiUCKrBK8/RGVffRzlKH7urw=", "narHash": "sha256-AwQv9kstzEOYjzuC9uY8jECqFJPuV/UxPLa30L3DLqo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "0900ff903f376cc822ca637fef58c1ca4f44fab5", "rev": "1388e72dd8562c8b2908fd655dee0c797df9e930",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -57,11 +57,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1722415718, "lastModified": 1722730825,
"narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=", "narHash": "sha256-X6U+w8qFBuGPCYrZzc9mpN34aRjQ8604MonpBUkj908=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c3392ad349a5227f4a3464dce87bcc5046692fce", "rev": "f3834de3782b82bfc666abf664f946d0e7d1f116",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -82,11 +82,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1722337341, "lastModified": 1722798820,
"narHash": "sha256-Myc+UnbLDQccueeO1q5CF0sNiGebQo1N+cdOpDMhNsg=", "narHash": "sha256-/Bd0VzlutcxTwSNouS/iC6BDv395NoO4XmBJaS2vQLg=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "4feec4b0c1d5aad7aba34e0397fe7bd984c9a634", "rev": "c9109f23de57359df39db6fa36b5ca4c64b671e1",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View File

@ -28,7 +28,7 @@
fenix.packages.${system}.fromToolchainFile fenix.packages.${system}.fromToolchainFile
{ {
file = ./rust-toolchain.toml; file = ./rust-toolchain.toml;
sha256 = "sha256-Ngiz76YP4HTY75GGdH2P+APE/DEIx2R/Dn+BwwOyzZU="; sha256 = "sha256-6eN/GKzjVSjEhGO9FhWObkRFaE1Jf+uqMSdQnb8lcB4=";
}; };
in in
pkgs.makeRustPlatform { pkgs.makeRustPlatform {

2
rust-toolchain.toml
View File

@ -1,2 +1,2 @@
[toolchain] [toolchain]
channel = "1.79" channel = "1.80"