Adhere to lints.

qu1x · Nov 30, 2024 · c737ebb · c737ebb
1 parent d5c85a5
commit c737ebb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/controller/key.rs b/src/controller/key.rs
@@ -18,12 +18,11 @@ pub fn key(
 	v: f32,
 	t: f32,
 ) {
-	let pressed = |key: Option<KeyCode>| key.map_or(false, |key| key_input.pressed(key));
-	let just_pressed = |key: Option<KeyCode>| key.map_or(false, |key| key_input.just_pressed(key));
-	let just_released =
-		|key: Option<KeyCode>| key.map_or(false, |key| key_input.just_released(key));
+	let pressed = |key: Option<KeyCode>| key.is_some_and(|key| key_input.pressed(key));
+	let just_pressed = |key: Option<KeyCode>| key.is_some_and(|key| key_input.just_pressed(key));
+	let just_released = |key: Option<KeyCode>| key.is_some_and(|key| key_input.just_released(key));
 	let pressed_button =
-		|button: Option<MouseButton>| button.map_or(false, |button| mouse_input.pressed(button));
+		|button: Option<MouseButton>| button.is_some_and(|button| mouse_input.pressed(button));
 	if just_pressed(controller.input.reset_key) {
 		trackball_events.send(TrackballEvent::reset(group));
 	}

diff --git a/src/controller/mouse.rs b/src/controller/mouse.rs
@@ -33,11 +33,10 @@ pub fn mouse(
 ) {
 	let pos = Point2::from(window.cursor_position().map_or(max * 0.5, |pos| pos - min));
 	let max = max.into();
-	let just_pressed_button = |button: Option<MouseButton>| {
-		button.map_or(false, |button| mouse_input.just_pressed(button))
-	};
+	let just_pressed_button =
+		|button: Option<MouseButton>| button.is_some_and(|button| mouse_input.just_pressed(button));
 	let just_released_button = |button: Option<MouseButton>| {
-		button.map_or(false, |button| mouse_input.just_released(button))
+		button.is_some_and(|button| mouse_input.just_released(button))
 	};
 	if just_pressed_button(controller.input.first_button) {
 		controller.first.capture(trackball.frame.yaw_axis());
@@ -95,7 +94,7 @@ pub fn mouse(
 		if controller
 			.input
 			.orbit_button
-			.map_or(false, |button| mouse_input.pressed(button))
+			.is_some_and(|button| mouse_input.pressed(button))
 		{
 			if let Some((_num, pos, _rot, _rat)) = controller.touch.compute(None, pos.into(), 0) {
 				if let Some(rot) = controller.orbit.compute(&pos, &max) {
@@ -106,7 +105,7 @@ pub fn mouse(
 		if controller
 			.input
 			.slide_button
-			.map_or(false, |button| mouse_input.pressed(button))
+			.is_some_and(|button| mouse_input.pressed(button))
 		{
 			if let Some(vec) = controller
 				.slide