Skip to content

Commit cf6cf07

Browse files
committed
♻️ refactor: remove .unwrap()
1 parent dc2e8ec commit cf6cf07

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

src/popups/conventional_commit.rs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use crate::{
2828
ui,
2929
};
3030

31-
#[derive(EnumIter, Display, Clone)]
31+
#[derive(EnumIter, Display, Copy, Clone)]
3232
#[strum(serialize_all = "lowercase")]
3333
enum CommitType {
3434
Refactor,
@@ -755,19 +755,15 @@ impl Component for ConventionalCommitPopup {
755755
{
756756
self.validate_escape(commit_type);
757757
} else {
758-
let commit = self
758+
if let Some(&commit) = self
759759
.query_results_type
760760
.get(self.selected_index)
761-
.cloned();
762-
763-
self.seleted_commit_type = commit.clone();
764-
self.next_step();
765-
766-
if let Some(more_infos) =
767-
commit.as_ref().map(|c| c.more_info())
768761
{
769-
if more_infos.len() == 1 {
770-
self.validate_escape(commit.unwrap());
762+
self.seleted_commit_type = Some(commit);
763+
self.next_step();
764+
765+
if commit.more_info().len() == 1 {
766+
self.validate_escape(commit);
771767
}
772768
}
773769
}

0 commit comments

Comments
 (0)