Skip to content

Commit 4c17a4b

Browse files
committed
chore: fmt
1 parent 160f9f8 commit 4c17a4b

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

src/app.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ use crate::{
1010
options::{Options, SharedOptions},
1111
popup_stack::PopupStack,
1212
popups::{
13-
AppOption, BlameFilePopup, BranchListPopup, CommitPopup,
14-
CompareCommitsPopup, ConfirmPopup, CreateBranchPopup,
15-
CreateRemotePopup, ExternalEditorPopup, FetchPopup,
16-
FileRevlogPopup, FuzzyFindPopup, HelpPopup,
17-
InspectCommitPopup, LogSearchPopupPopup, MsgPopup,
18-
OptionsPopup, PullPopup, PushPopup, PushTagsPopup,
19-
RemoteListPopup, RenameBranchPopup, RenameRemotePopup,
20-
ResetPopup, RevisionFilesPopup, StashMsgPopup,
21-
SubmodulesListPopup, TagCommitPopup, TagListPopup,
22-
UpdateRemoteUrlPopup, CheckoutOptionPopup
13+
AppOption, BlameFilePopup, BranchListPopup,
14+
CheckoutOptionPopup, CommitPopup, CompareCommitsPopup,
15+
ConfirmPopup, CreateBranchPopup, CreateRemotePopup,
16+
ExternalEditorPopup, FetchPopup, FileRevlogPopup,
17+
FuzzyFindPopup, HelpPopup, InspectCommitPopup,
18+
LogSearchPopupPopup, MsgPopup, OptionsPopup, PullPopup,
19+
PushPopup, PushTagsPopup, RemoteListPopup, RenameBranchPopup,
20+
RenameRemotePopup, ResetPopup, RevisionFilesPopup,
21+
StashMsgPopup, SubmodulesListPopup, TagCommitPopup,
22+
TagListPopup, UpdateRemoteUrlPopup,
2323
},
2424
queue::{
2525
Action, AppTabs, InternalEvent, NeedsUpdate, Queue,
@@ -98,7 +98,7 @@ pub struct App {
9898
submodule_popup: SubmodulesListPopup,
9999
tags_popup: TagListPopup,
100100
reset_popup: ResetPopup,
101-
checkout_option_popup: CheckoutOptionPopup,
101+
checkout_option_popup: CheckoutOptionPopup,
102102
cmdbar: RefCell<CommandBar>,
103103
tab: usize,
104104
revlog: Revlog,
@@ -219,7 +219,7 @@ impl App {
219219
stashing_tab: Stashing::new(&env),
220220
stashlist_tab: StashList::new(&env),
221221
files_tab: FilesTab::new(&env),
222-
checkout_option_popup: CheckoutOptionPopup::new(&env),
222+
checkout_option_popup: CheckoutOptionPopup::new(&env),
223223
tab: 0,
224224
queue: env.queue,
225225
theme: env.theme,
@@ -495,7 +495,7 @@ impl App {
495495
fetch_popup,
496496
tag_commit_popup,
497497
reset_popup,
498-
checkout_option_popup,
498+
checkout_option_popup,
499499
create_branch_popup,
500500
create_remote_popup,
501501
rename_remote_popup,
@@ -536,7 +536,7 @@ impl App {
536536
submodule_popup,
537537
tags_popup,
538538
reset_popup,
539-
checkout_option_popup,
539+
checkout_option_popup,
540540
create_branch_popup,
541541
rename_branch_popup,
542542
revision_files_popup,
@@ -908,10 +908,10 @@ impl App {
908908
}
909909
InternalEvent::CommitSearch(options) => {
910910
self.revlog.search(options);
911-
},
912-
InternalEvent::CheckoutOption(branch, is_local) => {
913-
self.checkout_option_popup.open(branch, is_local)?;
914-
}
911+
}
912+
InternalEvent::CheckoutOption(branch, is_local) => {
913+
self.checkout_option_popup.open(branch, is_local)?;
914+
}
915915
};
916916

917917
Ok(flags)

src/popups/branchlist.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ impl BranchListPopup {
610610
} else {
611611
self.queue.push(InternalEvent::CheckoutOption(
612612
selected_branch.clone(),
613-
self.local.clone()
613+
self.local.clone(),
614614
));
615615
}
616616

src/popups/checkout_option.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ impl CheckoutOptionPopup {
152152
stash_apply(&self.repo, stash_id, false)?;
153153
}
154154
CheckoutOptions::Unchange => {
155-
self.checkout()?;
155+
self.checkout()?;
156156
}
157157
CheckoutOptions::Discard => {
158158
discard_status(&self.repo)?;

src/popups/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
mod blame_file;
22
mod branchlist;
3+
mod checkout_option;
34
mod commit;
45
mod compare_commits;
56
mod confirm;
@@ -27,10 +28,10 @@ mod submodules;
2728
mod tag_commit;
2829
mod taglist;
2930
mod update_remote_url;
30-
mod checkout_option;
3131

3232
pub use blame_file::{BlameFileOpen, BlameFilePopup};
3333
pub use branchlist::BranchListPopup;
34+
pub use checkout_option::CheckoutOptionPopup;
3435
pub use commit::CommitPopup;
3536
pub use compare_commits::CompareCommitsPopup;
3637
pub use confirm::ConfirmPopup;
@@ -58,7 +59,6 @@ pub use submodules::SubmodulesListPopup;
5859
pub use tag_commit::TagCommitPopup;
5960
pub use taglist::TagListPopup;
6061
pub use update_remote_url::UpdateRemoteUrlPopup;
61-
pub use checkout_option::CheckoutOptionPopup;
6262

6363
use crate::ui::style::Theme;
6464
use ratatui::{

0 commit comments

Comments
 (0)