From a77f7f41db866abec8070477c4909d9e64dd6102 Mon Sep 17 00:00:00 2001 From: extrawurst Date: Thu, 19 Mar 2026 15:44:51 +0000 Subject: [PATCH 1/4] msrv bump to 1.85 --- .clippy.toml | 2 +- .github/workflows/ci.yml | 8 ++++---- CHANGELOG.md | 3 +++ Cargo.toml | 2 +- README.md | 2 +- asyncgit/src/sync/staging/mod.rs | 2 +- filetreelist/src/item.rs | 10 +++++----- src/cmdbar.rs | 2 +- src/components/status_tree.rs | 4 ++-- src/components/textinput.rs | 4 ++-- src/popups/checkout_option.rs | 2 +- src/popups/commit.rs | 4 +++- src/popups/goto_line.rs | 2 +- src/popups/log_search.rs | 2 +- src/popups/options.rs | 2 +- src/popups/reset.rs | 2 +- src/popups/stashmsg.rs | 2 +- src/spinner.rs | 2 +- src/ui/reflow.rs | 5 ++++- src/ui/stateful_paragraph.rs | 2 +- 20 files changed, 36 insertions(+), 28 deletions(-) diff --git a/.clippy.toml b/.clippy.toml index 2f3418ba16..e42745fa92 100644 --- a/.clippy.toml +++ b/.clippy.toml @@ -1,2 +1,2 @@ -msrv = "1.82.0" +msrv = "1.85.0" cognitive-complexity-threshold = 18 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e612935ee9..f0b9ce0b5a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - rust: [nightly, stable, "1.82"] + rust: [nightly, stable, "1.85"] runs-on: ${{ matrix.os }} continue-on-error: ${{ matrix.rust == 'nightly' }} @@ -94,7 +94,7 @@ jobs: strategy: fail-fast: false matrix: - rust: [nightly, stable, "1.82"] + rust: [nightly, stable, "1.85"] continue-on-error: ${{ matrix.rust == 'nightly' }} steps: - uses: actions/checkout@v4 @@ -148,7 +148,7 @@ jobs: strategy: fail-fast: false matrix: - rust: [nightly, stable, "1.82"] + rust: [nightly, stable, "1.85"] continue-on-error: ${{ matrix.rust == 'nightly' }} steps: - uses: actions/checkout@v4 @@ -199,7 +199,7 @@ jobs: strategy: fail-fast: false matrix: - rust: [nightly, stable, "1.82"] + rust: [nightly, stable, "1.85"] continue-on-error: ${{ matrix.rust == 'nightly' }} steps: - uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 4aba19c7e0..1667915e17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Changed +* rust msrv bumped to `1.85` + ## [0.28.0] - 2025-12-14 **discard changes on checkout** diff --git a/Cargo.toml b/Cargo.toml index 8f07dd34e4..77db26204a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ version = "0.28.0" authors = ["extrawurst "] description = "blazing fast terminal-ui for git" edition = "2021" -rust-version = "1.82" +rust-version = "1.85" exclude = [".github/*", ".vscode/*", "assets/*"] homepage = "https://github.com/gitui-org/gitui" repository = "https://github.com/gitui-org/gitui" diff --git a/README.md b/README.md index f97b708148..5f98df35d4 100644 --- a/README.md +++ b/README.md @@ -220,7 +220,7 @@ see [NIGHTLIES.md](./NIGHTLIES.md) ### Requirements -- Minimum supported `rust`/`cargo` version: `1.82` +- Minimum supported `rust`/`cargo` version: `1.85` - See [Install Rust](https://www.rust-lang.org/tools/install) - To build openssl dependency (see https://docs.rs/openssl/latest/openssl/) diff --git a/asyncgit/src/sync/staging/mod.rs b/asyncgit/src/sync/staging/mod.rs index 06e09fe66b..fc16340811 100644 --- a/asyncgit/src/sync/staging/mod.rs +++ b/asyncgit/src/sync/staging/mod.rs @@ -34,7 +34,7 @@ impl NewFromOldContent { Ok(()) } - fn skip_old_line(&mut self) { + const fn skip_old_line(&mut self) { self.old_index += 1; } diff --git a/filetreelist/src/item.rs b/filetreelist/src/item.rs index b06c275df2..e96aa80f83 100644 --- a/filetreelist/src/item.rs +++ b/filetreelist/src/item.rs @@ -70,11 +70,11 @@ impl TreeItemInfo { } /// - pub fn unindent(&mut self) { + pub const fn unindent(&mut self) { self.indent = self.indent.saturating_sub(1); } - pub fn set_visible(&mut self, visible: bool) { + pub const fn set_visible(&mut self, visible: bool) { self.visible = visible; } } @@ -152,7 +152,7 @@ impl FileTreeItem { } /// - pub fn info_mut(&mut self) -> &mut TreeItemInfo { + pub const fn info_mut(&mut self) -> &mut TreeItemInfo { &mut self.info } @@ -176,12 +176,12 @@ impl FileTreeItem { } /// - pub fn hide(&mut self) { + pub const fn hide(&mut self) { self.info.visible = false; } /// - pub fn show(&mut self) { + pub const fn show(&mut self) { self.info.visible = true; } } diff --git a/src/cmdbar.rs b/src/cmdbar.rs index 6fce784da7..aa7f63099e 100644 --- a/src/cmdbar.rs +++ b/src/cmdbar.rs @@ -130,7 +130,7 @@ impl CommandBar { } } - pub fn toggle_more(&mut self) { + pub const fn toggle_more(&mut self) { if self.expandable { self.expanded = !self.expanded; } diff --git a/src/components/status_tree.rs b/src/components/status_tree.rs index 591152c3b4..0d8addb3f6 100644 --- a/src/components/status_tree.rs +++ b/src/components/status_tree.rs @@ -58,7 +58,7 @@ impl StatusTreeComponent { } } - pub fn set_commit(&mut self, revision: Option) { + pub const fn set_commit(&mut self, revision: Option) { self.revision = revision; } @@ -92,7 +92,7 @@ impl StatusTreeComponent { } /// - pub fn show_selection(&mut self, show: bool) { + pub const fn show_selection(&mut self, show: bool) { self.show_selection = show; } diff --git a/src/components/textinput.rs b/src/components/textinput.rs index e67d19eac9..bb9b7dc62b 100644 --- a/src/components/textinput.rs +++ b/src/components/textinput.rs @@ -127,12 +127,12 @@ impl TextInputComponent { } /// embed into parent draw area - pub fn embed(&mut self) { + pub const fn embed(&mut self) { self.embed = true; } /// - pub fn enabled(&mut self, enable: bool) { + pub const fn enabled(&mut self, enable: bool) { self.selected = Some(enable); } diff --git a/src/popups/checkout_option.rs b/src/popups/checkout_option.rs index ce71ed1b85..c2abdd0a84 100644 --- a/src/popups/checkout_option.rs +++ b/src/popups/checkout_option.rs @@ -115,7 +115,7 @@ impl CheckoutOptionPopup { Ok(()) } - fn change_kind(&mut self, incr: bool) { + const fn change_kind(&mut self, incr: bool) { self.option = if incr { self.option.next() } else { diff --git a/src/popups/commit.rs b/src/popups/commit.rs index 146286f832..c39840ecd9 100644 --- a/src/popups/commit.rs +++ b/src/popups/commit.rs @@ -336,6 +336,7 @@ impl CommitPopup { Ok(()) } + fn signoff_commit(&mut self) { let msg = self.input.get_text(); let signed_msg = self.add_sign_off(msg); @@ -343,7 +344,8 @@ impl CommitPopup { self.input.set_text(signed_msg); } } - fn toggle_verify(&mut self) { + + const fn toggle_verify(&mut self) { self.verify = !self.verify; } diff --git a/src/popups/goto_line.rs b/src/popups/goto_line.rs index 492f60b779..193e0e7753 100644 --- a/src/popups/goto_line.rs +++ b/src/popups/goto_line.rs @@ -46,7 +46,7 @@ impl GotoLinePopup { } } - pub fn open(&mut self, max_line: usize) { + pub const fn open(&mut self, max_line: usize) { self.visible = true; self.max_line = max_line; } diff --git a/src/popups/log_search.rs b/src/popups/log_search.rs index 3cd6ad86b1..9edbfd6732 100644 --- a/src/popups/log_search.rs +++ b/src/popups/log_search.rs @@ -315,7 +315,7 @@ impl LogSearchPopupPopup { } } - fn move_selection(&mut self, arg: bool) { + const fn move_selection(&mut self, arg: bool) { if arg { //up self.selection = match self.selection { diff --git a/src/popups/options.rs b/src/popups/options.rs index 4e194cb571..b365c64817 100644 --- a/src/popups/options.rs +++ b/src/popups/options.rs @@ -134,7 +134,7 @@ impl OptionsPopup { ])); } - fn move_selection(&mut self, up: bool) { + const fn move_selection(&mut self, up: bool) { if up { self.selection = match self.selection { AppOption::StatusShowUntracked => { diff --git a/src/popups/reset.rs b/src/popups/reset.rs index e0c017bc10..d40d2a6ffe 100644 --- a/src/popups/reset.rs +++ b/src/popups/reset.rs @@ -137,7 +137,7 @@ impl ResetPopup { self.hide(); } - fn change_kind(&mut self, incr: bool) { + const fn change_kind(&mut self, incr: bool) { self.kind = if incr { match self.kind { ResetType::Soft => ResetType::Mixed, diff --git a/src/popups/stashmsg.rs b/src/popups/stashmsg.rs index 8c7a7a07bd..f742106441 100644 --- a/src/popups/stashmsg.rs +++ b/src/popups/stashmsg.rs @@ -138,7 +138,7 @@ impl StashMsgPopup { } /// - pub fn options(&mut self, options: StashingOptions) { + pub const fn options(&mut self, options: StashingOptions) { self.options = options; } } diff --git a/src/spinner.rs b/src/spinner.rs index 2fc6b3a2cb..c6cee254ff 100644 --- a/src/spinner.rs +++ b/src/spinner.rs @@ -34,7 +34,7 @@ impl Spinner { } /// - pub fn set_state(&mut self, active: bool) { + pub const fn set_state(&mut self, active: bool) { self.active = active; } diff --git a/src/ui/reflow.rs b/src/ui/reflow.rs index 1de2a5c359..2238c44532 100644 --- a/src/ui/reflow.rs +++ b/src/ui/reflow.rs @@ -161,7 +161,10 @@ impl<'a, 'b> LineTruncator<'a, 'b> { } } - pub fn set_horizontal_offset(&mut self, horizontal_offset: u16) { + pub const fn set_horizontal_offset( + &mut self, + horizontal_offset: u16, + ) { self.horizontal_offset = horizontal_offset; } } diff --git a/src/ui/stateful_paragraph.rs b/src/ui/stateful_paragraph.rs index ca7d09fb34..fc8ec07686 100644 --- a/src/ui/stateful_paragraph.rs +++ b/src/ui/stateful_paragraph.rs @@ -70,7 +70,7 @@ impl ParagraphState { self.scroll } - pub fn set_scroll(&mut self, scroll: ScrollPos) { + pub const fn set_scroll(&mut self, scroll: ScrollPos) { self.scroll = scroll; } } From 4cd510cdcd08a180d57f0f50be76935c5a344f0c Mon Sep 17 00:00:00 2001 From: extrawurst Date: Thu, 19 Mar 2026 15:53:41 +0000 Subject: [PATCH 2/4] bump to 1.88 --- .clippy.toml | 2 +- .github/workflows/ci.yml | 8 +++--- CHANGELOG.md | 2 +- Cargo.toml | 32 +++++++++++------------ README.md | 2 +- filetreelist/src/filetreeitems.rs | 2 +- src/components/changes.rs | 2 +- src/components/commitlist.rs | 4 +-- src/components/status_tree.rs | 2 +- src/components/textinput.rs | 2 +- src/components/utils/filetree.rs | 2 +- src/components/utils/scroll_horizontal.rs | 2 +- src/components/utils/scroll_vertical.rs | 2 +- src/components/utils/statustree.rs | 2 +- src/options.rs | 2 +- src/popups/branchlist.rs | 2 +- src/popups/remotelist.rs | 2 +- 17 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.clippy.toml b/.clippy.toml index e42745fa92..4bdda4fc2b 100644 --- a/.clippy.toml +++ b/.clippy.toml @@ -1,2 +1,2 @@ -msrv = "1.85.0" +msrv = "1.88.0" cognitive-complexity-threshold = 18 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0b9ce0b5a..f87853e0e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - rust: [nightly, stable, "1.85"] + rust: [nightly, stable, "1.88"] runs-on: ${{ matrix.os }} continue-on-error: ${{ matrix.rust == 'nightly' }} @@ -94,7 +94,7 @@ jobs: strategy: fail-fast: false matrix: - rust: [nightly, stable, "1.85"] + rust: [nightly, stable, "1.88"] continue-on-error: ${{ matrix.rust == 'nightly' }} steps: - uses: actions/checkout@v4 @@ -148,7 +148,7 @@ jobs: strategy: fail-fast: false matrix: - rust: [nightly, stable, "1.85"] + rust: [nightly, stable, "1.88"] continue-on-error: ${{ matrix.rust == 'nightly' }} steps: - uses: actions/checkout@v4 @@ -199,7 +199,7 @@ jobs: strategy: fail-fast: false matrix: - rust: [nightly, stable, "1.85"] + rust: [nightly, stable, "1.88"] continue-on-error: ${{ matrix.rust == 'nightly' }} steps: - uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1667915e17..f8d86b65a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased ### Changed -* rust msrv bumped to `1.85` +* rust msrv bumped to `1.88` ## [0.28.0] - 2025-12-14 diff --git a/Cargo.toml b/Cargo.toml index 77db26204a..c6c6f6d0cf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,14 +4,14 @@ version = "0.28.0" authors = ["extrawurst "] description = "blazing fast terminal-ui for git" edition = "2021" -rust-version = "1.85" +rust-version = "1.88" exclude = [".github/*", ".vscode/*", "assets/*"] homepage = "https://github.com/gitui-org/gitui" repository = "https://github.com/gitui-org/gitui" readme = "README.md" license = "MIT" categories = ["command-line-utilities"] -keywords = ["git", "gui", "cli", "terminal", "ui"] +keywords = ["cli", "git", "gui", "terminal", "ui"] build = "build.rs" [workspace] @@ -43,7 +43,7 @@ bugreport = "0.5.1" bwrap = { version = "1.3", features = ["use_std"] } bytesize = { version = "2.3", default-features = false } chrono = { version = "0.4", default-features = false, features = ["clock"] } -clap = { version = "4.5", features = ["env", "cargo"] } +clap = { version = "4.5", features = ["cargo", "env"] } crossbeam-channel = "0.5" crossterm = { version = "0.28", features = ["serde"] } dirs = "6.0" @@ -59,8 +59,8 @@ notify-debouncer-mini = "0.7" once_cell = "1" parking_lot_core = "0.9" ratatui = { version = "0.29", default-features = false, features = [ - 'crossterm', - 'serde', + "crossterm", + "serde", ] } rayon-core = "1.13" ron = "0.12" @@ -71,11 +71,11 @@ shellexpand = "3.1" simplelog = { version = "0.12", default-features = false } struct-patch = "0.10" syntect = { version = "5.3", default-features = false, features = [ - "parsing", - "default-syntaxes", - "default-themes", - "plist-load", - "html", + "default-syntaxes", + "default-themes", + "html", + "parsing", + "plist-load", ] } tui-textarea = "0.7" two-face = { version = "0.4.4", default-features = false } @@ -95,14 +95,14 @@ tempfile = "3" [badges] maintenance = { status = "actively-developed" } -[profile.release] -lto = true -opt-level = 'z' # Optimize for size. -codegen-units = 1 -strip = "debuginfo" - # make debug build as fast as release # usage of utf8 encoding inside tui # makes their debug profile slow [profile.dev.package."ratatui"] opt-level = 3 + +[profile.release] +opt-level = "z" # Optimize for size. +strip = "debuginfo" +lto = true +codegen-units = 1 diff --git a/README.md b/README.md index 5f98df35d4..c5a7785c52 100644 --- a/README.md +++ b/README.md @@ -220,7 +220,7 @@ see [NIGHTLIES.md](./NIGHTLIES.md) ### Requirements -- Minimum supported `rust`/`cargo` version: `1.85` +- Minimum supported `rust`/`cargo` version: `1.88` - See [Install Rust](https://www.rust-lang.org/tools/install) - To build openssl dependency (see https://docs.rs/openssl/latest/openssl/) diff --git a/filetreelist/src/filetreeitems.rs b/filetreelist/src/filetreeitems.rs index 957eff3621..08a850bf9e 100644 --- a/filetreelist/src/filetreeitems.rs +++ b/filetreelist/src/filetreeitems.rs @@ -59,7 +59,7 @@ impl FileTreeItems { } /// how many individual items (files/paths) are in the list - pub fn len(&self) -> usize { + pub const fn len(&self) -> usize { self.tree_items.len() } diff --git a/src/components/changes.rs b/src/components/changes.rs index 48883d20e8..74f11e581a 100644 --- a/src/components/changes.rs +++ b/src/components/changes.rs @@ -67,7 +67,7 @@ impl ChangesComponent { } /// returns true if list is empty - pub fn is_empty(&self) -> bool { + pub const fn is_empty(&self) -> bool { self.files.is_empty() } diff --git a/src/components/commitlist.rs b/src/components/commitlist.rs index fa21185dc7..a84060151d 100644 --- a/src/components/commitlist.rs +++ b/src/components/commitlist.rs @@ -113,7 +113,7 @@ impl CommitList { } /// - pub fn marked_count(&self) -> usize { + pub const fn marked_count(&self) -> usize { self.marked.len() } @@ -284,7 +284,7 @@ impl CommitList { } /// will return view size or None before the first render - fn current_size(&self) -> Option<(u16, u16)> { + const fn current_size(&self) -> Option<(u16, u16)> { self.current_size.get() } diff --git a/src/components/status_tree.rs b/src/components/status_tree.rs index 0d8addb3f6..6ae3cf318e 100644 --- a/src/components/status_tree.rs +++ b/src/components/status_tree.rs @@ -97,7 +97,7 @@ impl StatusTreeComponent { } /// returns true if list is empty - pub fn is_empty(&self) -> bool { + pub const fn is_empty(&self) -> bool { self.tree.is_empty() } diff --git a/src/components/textinput.rs b/src/components/textinput.rs index bb9b7dc62b..6e71382b26 100644 --- a/src/components/textinput.rs +++ b/src/components/textinput.rs @@ -122,7 +122,7 @@ impl TextInputComponent { } /// screen area (last time we got drawn) - pub fn get_area(&self) -> Rect { + pub const fn get_area(&self) -> Rect { self.current_area.get() } diff --git a/src/components/utils/filetree.rs b/src/components/utils/filetree.rs index 1329b9bef8..2a0b37a7b3 100644 --- a/src/components/utils/filetree.rs +++ b/src/components/utils/filetree.rs @@ -172,7 +172,7 @@ impl FileTreeItems { } /// - pub(crate) fn len(&self) -> usize { + pub(crate) const fn len(&self) -> usize { self.items.len() } diff --git a/src/components/utils/scroll_horizontal.rs b/src/components/utils/scroll_horizontal.rs index 67825744a1..9ee7e5a397 100644 --- a/src/components/utils/scroll_horizontal.rs +++ b/src/components/utils/scroll_horizontal.rs @@ -18,7 +18,7 @@ impl HorizontalScroll { } } - pub fn get_right(&self) -> usize { + pub const fn get_right(&self) -> usize { self.right.get() } diff --git a/src/components/utils/scroll_vertical.rs b/src/components/utils/scroll_vertical.rs index 51cb05f82f..1f7ed77918 100644 --- a/src/components/utils/scroll_vertical.rs +++ b/src/components/utils/scroll_vertical.rs @@ -20,7 +20,7 @@ impl VerticalScroll { } } - pub fn get_top(&self) -> usize { + pub const fn get_top(&self) -> usize { self.top.get() } diff --git a/src/components/utils/statustree.rs b/src/components/utils/statustree.rs index 47a1e00529..3f0b4d6de9 100644 --- a/src/components/utils/statustree.rs +++ b/src/components/utils/statustree.rs @@ -173,7 +173,7 @@ impl StatusTree { } /// - pub fn is_empty(&self) -> bool { + pub const fn is_empty(&self) -> bool { self.tree.items().is_empty() } diff --git a/src/options.rs b/src/options.rs index 84063e6970..a80e5cb80f 100644 --- a/src/options.rs +++ b/src/options.rs @@ -116,7 +116,7 @@ impl Options { self.save(); } - pub fn has_commit_msg_history(&self) -> bool { + pub const fn has_commit_msg_history(&self) -> bool { !self.data.commit_msgs.is_empty() } diff --git a/src/popups/branchlist.rs b/src/popups/branchlist.rs index ab52980e9e..fa66ffffad 100644 --- a/src/popups/branchlist.rs +++ b/src/popups/branchlist.rs @@ -341,7 +341,7 @@ impl BranchListPopup { Ok(()) } - fn valid_selection(&self) -> bool { + const fn valid_selection(&self) -> bool { !self.branches.is_empty() } diff --git a/src/popups/remotelist.rs b/src/popups/remotelist.rs index 0630e35fb5..7f14f77dd2 100644 --- a/src/popups/remotelist.rs +++ b/src/popups/remotelist.rs @@ -411,7 +411,7 @@ impl RemoteListPopup { Ok(true) } - fn valid_selection(&self) -> bool { + const fn valid_selection(&self) -> bool { !self.remote_names.is_empty() && self.remote_names.len() >= self.selection as usize } From ac616d8885ac4566100449d0d98c3c4793772b7e Mon Sep 17 00:00:00 2001 From: extrawurst Date: Thu, 19 Mar 2026 17:13:36 +0000 Subject: [PATCH 3/4] more clippy fixes --- src/app.rs | 2 +- src/components/status_tree.rs | 2 +- src/popups/create_branch.rs | 2 +- src/popups/create_remote.rs | 2 +- src/popups/log_search.rs | 8 ++++---- src/popups/rename_branch.rs | 2 +- src/popups/rename_remote.rs | 2 +- src/popups/tag_commit.rs | 2 +- src/popups/update_remote_url.rs | 2 +- src/tabs/stashlist.rs | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/app.rs b/src/app.rs index eb804e6fdd..8626aa3b8e 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1097,7 +1097,7 @@ impl App { Err(e) => { log::error!("delete remote: {e:?}"); self.queue.push(InternalEvent::ShowErrorMsg( - format!("delete remote error:\n{e}",), + format!("delete remote error:\n{e}"), )); } } diff --git a/src/components/status_tree.rs b/src/components/status_tree.rs index 6ae3cf318e..ac4fc9f6a8 100644 --- a/src/components/status_tree.rs +++ b/src/components/status_tree.rs @@ -208,7 +208,7 @@ impl StatusTreeComponent { w = width as usize ) } else { - format!(" {indent_str}{collapse_char}{string}",) + format!(" {indent_str}{collapse_char}{string}") }; Some(Span::styled( diff --git a/src/popups/create_branch.rs b/src/popups/create_branch.rs index bc83031047..9c03970aa6 100644 --- a/src/popups/create_branch.rs +++ b/src/popups/create_branch.rs @@ -131,7 +131,7 @@ impl CreateBranchPopup { Err(e) => { log::error!("create branch: {e}"); self.queue.push(InternalEvent::ShowErrorMsg( - format!("create branch error:\n{e}",), + format!("create branch error:\n{e}"), )); } } diff --git a/src/popups/create_remote.rs b/src/popups/create_remote.rs index e6a51a925f..af1c37eb60 100644 --- a/src/popups/create_remote.rs +++ b/src/popups/create_remote.rs @@ -202,7 +202,7 @@ impl CreateRemotePopup { Err(e) => { log::error!("create remote: {e}"); self.queue.push(InternalEvent::ShowErrorMsg( - format!("create remote error:\n{e}",), + format!("create remote error:\n{e}"), )); } } diff --git a/src/popups/log_search.rs b/src/popups/log_search.rs index 9edbfd6732..6f4602cd8a 100644 --- a/src/popups/log_search.rs +++ b/src/popups/log_search.rs @@ -225,7 +225,7 @@ impl LogSearchPopupPopup { ), )]), Line::from(vec![Span::styled( - format!("[{x_summary}] summary",), + format!("[{x_summary}] summary"), self.theme.text( matches!( self.selection, @@ -235,7 +235,7 @@ impl LogSearchPopupPopup { ), )]), Line::from(vec![Span::styled( - format!("[{x_body}] message body",), + format!("[{x_body}] message body"), self.theme.text( matches!( self.selection, @@ -245,7 +245,7 @@ impl LogSearchPopupPopup { ), )]), Line::from(vec![Span::styled( - format!("[{x_files}] committed files",), + format!("[{x_files}] committed files"), self.theme.text( matches!( self.selection, @@ -255,7 +255,7 @@ impl LogSearchPopupPopup { ), )]), Line::from(vec![Span::styled( - format!("[{x_authors}] authors",), + format!("[{x_authors}] authors"), self.theme.text( matches!( self.selection, diff --git a/src/popups/rename_branch.rs b/src/popups/rename_branch.rs index 05b4ea9371..85190673b0 100644 --- a/src/popups/rename_branch.rs +++ b/src/popups/rename_branch.rs @@ -140,7 +140,7 @@ impl RenameBranchPopup { Err(e) => { log::error!("create branch: {e}"); self.queue.push(InternalEvent::ShowErrorMsg( - format!("rename branch error:\n{e}",), + format!("rename branch error:\n{e}"), )); } } diff --git a/src/popups/rename_remote.rs b/src/popups/rename_remote.rs index a5dc914fa2..52dafa3c84 100644 --- a/src/popups/rename_remote.rs +++ b/src/popups/rename_remote.rs @@ -163,7 +163,7 @@ impl RenameRemotePopup { Err(e) => { log::error!("rename remote: {e}"); self.queue.push(InternalEvent::ShowErrorMsg( - format!("rename remote error:\n{e}",), + format!("rename remote error:\n{e}"), )); } } diff --git a/src/popups/tag_commit.rs b/src/popups/tag_commit.rs index b7343d9248..b39ffa8ae3 100644 --- a/src/popups/tag_commit.rs +++ b/src/popups/tag_commit.rs @@ -196,7 +196,7 @@ impl TagCommitPopup { log::error!("e: {e}"); self.queue.push(InternalEvent::ShowErrorMsg( - format!("tag error:\n{e}",), + format!("tag error:\n{e}"), )); } } diff --git a/src/popups/update_remote_url.rs b/src/popups/update_remote_url.rs index 5a7f2aa869..c33c052ed2 100644 --- a/src/popups/update_remote_url.rs +++ b/src/popups/update_remote_url.rs @@ -140,7 +140,7 @@ impl UpdateRemoteUrlPopup { Err(e) => { log::error!("update remote url: {e}"); self.queue.push(InternalEvent::ShowErrorMsg( - format!("update remote url error:\n{e}",), + format!("update remote url error:\n{e}"), )); } } diff --git a/src/tabs/stashlist.rs b/src/tabs/stashlist.rs index 1a97a0ac38..6b78a07630 100644 --- a/src/tabs/stashlist.rs +++ b/src/tabs/stashlist.rs @@ -55,7 +55,7 @@ impl StashList { } Err(e) => { self.queue.push(InternalEvent::ShowErrorMsg( - format!("stash apply error:\n{e}",), + format!("stash apply error:\n{e}"), )); } } From 8de205aeceeff37cfc27d44483788272b49964e2 Mon Sep 17 00:00:00 2001 From: extrawurst Date: Thu, 19 Mar 2026 17:22:07 +0000 Subject: [PATCH 4/4] cargo clippy --- src/popups/commit.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/popups/commit.rs b/src/popups/commit.rs index c39840ecd9..b5dff7677c 100644 --- a/src/popups/commit.rs +++ b/src/popups/commit.rs @@ -448,7 +448,7 @@ impl CommitPopup { msg_source, &mut msg, )? { - log::error!("prepare-commit-msg hook rejection: {e}",); + log::error!("prepare-commit-msg hook rejection: {e}"); } self.input.set_text(msg);