Skip to content

Commit c737ebb

Browse files
committed
Adhere to lints.
1 parent d5c85a5 commit c737ebb

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

src/controller/key.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@ pub fn key(
1818
v: f32,
1919
t: f32,
2020
) {
21-
let pressed = |key: Option<KeyCode>| key.map_or(false, |key| key_input.pressed(key));
22-
let just_pressed = |key: Option<KeyCode>| key.map_or(false, |key| key_input.just_pressed(key));
23-
let just_released =
24-
|key: Option<KeyCode>| key.map_or(false, |key| key_input.just_released(key));
21+
let pressed = |key: Option<KeyCode>| key.is_some_and(|key| key_input.pressed(key));
22+
let just_pressed = |key: Option<KeyCode>| key.is_some_and(|key| key_input.just_pressed(key));
23+
let just_released = |key: Option<KeyCode>| key.is_some_and(|key| key_input.just_released(key));
2524
let pressed_button =
26-
|button: Option<MouseButton>| button.map_or(false, |button| mouse_input.pressed(button));
25+
|button: Option<MouseButton>| button.is_some_and(|button| mouse_input.pressed(button));
2726
if just_pressed(controller.input.reset_key) {
2827
trackball_events.send(TrackballEvent::reset(group));
2928
}

src/controller/mouse.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,10 @@ pub fn mouse(
3333
) {
3434
let pos = Point2::from(window.cursor_position().map_or(max * 0.5, |pos| pos - min));
3535
let max = max.into();
36-
let just_pressed_button = |button: Option<MouseButton>| {
37-
button.map_or(false, |button| mouse_input.just_pressed(button))
38-
};
36+
let just_pressed_button =
37+
|button: Option<MouseButton>| button.is_some_and(|button| mouse_input.just_pressed(button));
3938
let just_released_button = |button: Option<MouseButton>| {
40-
button.map_or(false, |button| mouse_input.just_released(button))
39+
button.is_some_and(|button| mouse_input.just_released(button))
4140
};
4241
if just_pressed_button(controller.input.first_button) {
4342
controller.first.capture(trackball.frame.yaw_axis());
@@ -95,7 +94,7 @@ pub fn mouse(
9594
if controller
9695
.input
9796
.orbit_button
98-
.map_or(false, |button| mouse_input.pressed(button))
97+
.is_some_and(|button| mouse_input.pressed(button))
9998
{
10099
if let Some((_num, pos, _rot, _rat)) = controller.touch.compute(None, pos.into(), 0) {
101100
if let Some(rot) = controller.orbit.compute(&pos, &max) {
@@ -106,7 +105,7 @@ pub fn mouse(
106105
if controller
107106
.input
108107
.slide_button
109-
.map_or(false, |button| mouse_input.pressed(button))
108+
.is_some_and(|button| mouse_input.pressed(button))
110109
{
111110
if let Some(vec) = controller
112111
.slide

0 commit comments

Comments
 (0)