From 2d487c00e95ffeb46754c986c79429675f17e975 Mon Sep 17 00:00:00 2001 From: Thierry Berger Date: Mon, 24 Feb 2025 11:06:24 +0100 Subject: [PATCH] clippy --fix + adapt --- src/control/character_controller.rs | 8 ++++---- src/geometry/narrow_phase.rs | 22 ++++++++++++---------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/control/character_controller.rs b/src/control/character_controller.rs index ba0baeb1..889b17df 100644 --- a/src/control/character_controller.rs +++ b/src/control/character_controller.rs @@ -1041,8 +1041,8 @@ mod test { ); let character_body = bodies.get_mut(handle).unwrap(); let translation = character_body.translation(); - assert_eq!( - effective_movement.grounded, true, + assert!( + effective_movement.grounded, "movement should be grounded at all times for current setup (iter: {}), pos: {}.", i, translation + effective_movement.translation ); @@ -1168,8 +1168,8 @@ mod test { ); let character_body = bodies.get_mut(handle).unwrap(); let translation = character_body.translation(); - assert_eq!( - effective_movement.grounded, true, + assert!( + effective_movement.grounded, "movement should be grounded at all times for current setup (iter: {}), pos: {}.", i, translation + effective_movement.translation ); diff --git a/src/geometry/narrow_phase.rs b/src/geometry/narrow_phase.rs index 3597847a..2cd7c163 100644 --- a/src/geometry/narrow_phase.rs +++ b/src/geometry/narrow_phase.rs @@ -1268,11 +1268,12 @@ mod test { .contact_pair(collider_1_handle, collider_2_handle) .expect("The contact pair should exist."); assert_eq!(contact_pair.manifolds.len(), 0); - assert!(matches!( - narrow_phase.intersection_pair(collider_1_handle, collider_2_handle), - // Interaction pair is for sensors - None, - )); + assert!( + narrow_phase + .intersection_pair(collider_1_handle, collider_2_handle) + .is_none(), + "Interaction pair is for sensors" + ); /* Parent collider 2 to body 2. */ collider_set.set_parent(collider_2_handle, Some(body_2_handle), &mut rigid_body_set); @@ -1296,11 +1297,12 @@ mod test { .contact_pair(collider_1_handle, collider_2_handle) .expect("The contact pair should exist."); assert_eq!(contact_pair.manifolds.len(), 1); - assert!(matches!( - narrow_phase.intersection_pair(collider_1_handle, collider_2_handle), - // Interaction pair is for sensors - None, - )); + assert!( + narrow_phase + .intersection_pair(collider_1_handle, collider_2_handle) + .is_none(), + "Interaction pair is for sensors" + ); /* Run the game loop, stepping the simulation once per frame. */ for _ in 0..200 {