Skip to content

Commit d82b988

Browse files
committed
(refactor) use command_pump
1 parent 2ade92a commit d82b988

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

src/app.rs

+5-12
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ use crate::{
22
accessors,
33
cmdbar::CommandBar,
44
components::{
5-
event_pump, AppOption, BlameFileComponent,
6-
BranchListComponent, CommandBlocking, CommandInfo,
7-
CommitComponent, CompareCommitsComponent, Component,
8-
ConfirmComponent, CreateBranchComponent, DrawableComponent,
5+
command_pump, event_pump, AppOption, BlameFileComponent,
6+
BranchListComponent, CommandInfo, CommitComponent,
7+
CompareCommitsComponent, Component, ConfirmComponent,
8+
CreateBranchComponent, DrawableComponent,
99
ExternalEditorComponent, FetchComponent, FileFindPopup,
1010
FileRevlogComponent, HelpComponent, InspectCommitComponent,
1111
MsgComponent, OptionsPopupComponent, PullComponent,
@@ -1056,14 +1056,7 @@ impl App {
10561056
fn commands(&self, force_all: bool) -> Vec<CommandInfo> {
10571057
let mut res = Vec::new();
10581058

1059-
for c in self.components() {
1060-
if c.commands(&mut res, force_all)
1061-
!= CommandBlocking::PassingOn
1062-
&& !force_all
1063-
{
1064-
break;
1065-
}
1066-
}
1059+
command_pump(&mut res, force_all, &self.components());
10671060

10681061
res.push(CommandInfo::new(
10691062
strings::commands::find_file(&self.key_config),

0 commit comments

Comments
 (0)