Skip to content

Commit 9f3e7de

Browse files
jplattepoljar
authored andcommitted
refactor(multiverse): Use let chains
1 parent 58d2ae4 commit 9f3e7de

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

labs/multiverse/src/main.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -397,18 +397,17 @@ impl App {
397397
}
398398
}
399399
GlobalMode::Help => {
400-
if let Event::Key(key) = event {
401-
if let (KeyModifiers::NONE, Char('q') | Esc) = (key.modifiers, key.code)
402-
{
403-
self.set_global_mode(GlobalMode::Default)
404-
}
400+
if let Event::Key(key) = event
401+
&& let (KeyModifiers::NONE, Char('q') | Esc) = (key.modifiers, key.code)
402+
{
403+
self.set_global_mode(GlobalMode::Default)
405404
}
406405
}
407406
GlobalMode::Settings { view } => {
408-
if let Event::Key(key) = event {
409-
if view.handle_key_press(key).await {
410-
self.set_global_mode(GlobalMode::Default);
411-
}
407+
if let Event::Key(key) = event
408+
&& view.handle_key_press(key).await
409+
{
410+
self.set_global_mode(GlobalMode::Default);
412411
}
413412
}
414413
GlobalMode::Exiting { .. } => {}

labs/multiverse/src/widgets/room_view/mod.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,9 @@ impl RoomView {
587587
fn update(&mut self) {
588588
match &mut self.mode {
589589
Mode::Normal { invited_room_view } => {
590-
if invited_room_view.as_ref().is_some_and(|view| view.should_switch()) {
590+
if let Some(view) = invited_room_view
591+
&& view.should_switch()
592+
{
591593
self.mode = Mode::Normal { invited_room_view: None };
592594
}
593595
}
@@ -670,12 +672,12 @@ impl Widget for &mut RoomView {
670672
}
671673
};
672674

673-
if let Some(timeline_area) = timeline_area {
674-
if let Some(items) = self.get_selected_timeline_items() {
675-
let is_thread = matches!(self.kind, TimelineKind::Thread { .. });
676-
let mut timeline = TimelineView::new(&items, is_thread);
677-
timeline.render(timeline_area, buf, &mut self.timeline_list);
678-
}
675+
if let Some(timeline_area) = timeline_area
676+
&& let Some(items) = self.get_selected_timeline_items()
677+
{
678+
let is_thread = matches!(self.kind, TimelineKind::Thread { .. });
679+
let mut timeline = TimelineView::new(&items, is_thread);
680+
timeline.render(timeline_area, buf, &mut self.timeline_list);
679681
}
680682
} else {
681683
render_paragraph(buf, "Nothing to see here...".to_owned())

0 commit comments

Comments
 (0)