Skip to content

Commit 651120a

Browse files
committed
fix: unwrap()-less implementation
1 parent 4c05b68 commit 651120a

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

src/engine.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -733,8 +733,10 @@ impl Reedline {
733733

734734
let mut latest_resize = None;
735735
loop {
736-
if !self.reedline_event_queue.lock().unwrap().is_empty() {
737-
break;
736+
if let Ok(queue) = self.reedline_event_queue.lock() {
737+
if !queue.is_empty() {
738+
break;
739+
}
738740
}
739741
match event::read()? {
740742
Event::Resize(x, y) => {
@@ -804,9 +806,11 @@ impl Reedline {
804806
reedline_events.push(ReedlineEvent::Edit(ec));
805807
}
806808

807-
for event in self.reedline_event_queue.lock().unwrap().drain(..) {
808-
println!("Got event from queue: {}", event);
809-
reedline_events.push(event);
809+
if let Ok(mut queue) = self.reedline_event_queue.lock() {
810+
for event in queue.drain(..) {
811+
println!("Got event from queue: {}", event);
812+
reedline_events.push(event);
813+
}
810814
}
811815

812816
for event in reedline_events.drain(..) {

0 commit comments

Comments
 (0)