leyoda/cosmic-terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid manual 'try' statement (clippy::question_mark)

Browse source
This commit is contained in:
Daniel Eades 2024-04-14 21:06:06 +01:00 • committed by Jeremy Soller
parent 4913e08492
commit 4b7c0ca15a
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/mouse_reporter.rs
View file

@ -36,7 +36,7 @@ impl MouseReporter {
) -> Option<Vec<u8>> { ) -> Option<Vec<u8>> {
//Buttons are handle slightly different between normal and sgr //Buttons are handle slightly different between normal and sgr
//for normal/utf8 the button release is always reported as button 3 //for normal/utf8 the button release is always reported as button 3
let Some(mut button) = (match event { let mut button = (match event {
Event::Mouse(MouseEvent::ButtonPressed(b)) => { Event::Mouse(MouseEvent::ButtonPressed(b)) => {
self.button = Some(b); self.button = Some(b);
self.button_number(b) self.button_number(b)
@ -64,9 +64,7 @@ impl MouseReporter {
.map(|b| b + 32) .map(|b| b + 32)
} }
_ => None, _ => None,
}) else { })?;
return None;
};
if modifiers.shift() { if modifiers.shift() {
button += 4; button += 4;
@ -127,7 +125,7 @@ impl MouseReporter {
x: u32, x: u32,
y: u32, y: u32,
) -> Option<Vec<u8>> { ) -> Option<Vec<u8>> {
let Some((button_no, event_code)) = (match event { let (button_no, event_code) = (match event {
Event::Mouse(MouseEvent::ButtonPressed(button)) => { Event::Mouse(MouseEvent::ButtonPressed(button)) => {
//Button pressed is reported as button 0,1,2 and event code M //Button pressed is reported as button 0,1,2 and event code M
self.button = Some(button); self.button = Some(button);
@ -151,9 +149,7 @@ impl MouseReporter {
.map(|button| (self.button_number(button).map(|b| b + 32), "M")) .map(|button| (self.button_number(button).map(|b| b + 32), "M"))
} }
_ => None, _ => None,
}) else { })?;
return None;
};
if let Some(mut button_no) = button_no { if let Some(mut button_no) = button_no {
if modifiers.shift() { if modifiers.shift() {