From 0b6ec5ca7ca307dcc2d92f7d09c9dcf7f0cd2bf2 Mon Sep 17 00:00:00 2001 From: aviac Date: Wed, 21 Feb 2024 10:31:57 +0100 Subject: [PATCH] chore(update): remove `let _ = ` and just ignore event sends Authored-by: RobWalt --- backends/bevy_picking_egui/src/lib.rs | 2 +- backends/bevy_picking_sprite/src/lib.rs | 2 +- backends/bevy_picking_ui/src/lib.rs | 2 +- crates/bevy_picking_core/src/events.rs | 20 ++++++++++---------- crates/bevy_picking_input/src/mouse.rs | 4 ++-- crates/bevy_picking_input/src/touch.rs | 2 +- crates/bevy_picking_selection/src/lib.rs | 10 +++++----- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/backends/bevy_picking_egui/src/lib.rs b/backends/bevy_picking_egui/src/lib.rs index 733ed075..10ca759f 100644 --- a/backends/bevy_picking_egui/src/lib.rs +++ b/backends/bevy_picking_egui/src/lib.rs @@ -88,7 +88,7 @@ pub fn egui_picking( if ctx.get_mut().wants_pointer_input() { let entry = (entity, HitData::new(entity, 0.0, None, None)); let order = 1_000_000f32; // Assume egui should be on top of everything else. - let _ = output.send(PointerHits::new(*pointer, Vec::from([entry]), order)); + output.send(PointerHits::new(*pointer, Vec::from([entry]), order)); } } } diff --git a/backends/bevy_picking_sprite/src/lib.rs b/backends/bevy_picking_sprite/src/lib.rs index 4bf1d9a8..9b6a72ce 100644 --- a/backends/bevy_picking_sprite/src/lib.rs +++ b/backends/bevy_picking_sprite/src/lib.rs @@ -134,6 +134,6 @@ pub fn sprite_picking( .collect(); let order = camera.order as f32; - let _ = output.send(PointerHits::new(*pointer, picks, order)); + output.send(PointerHits::new(*pointer, picks, order)); } } diff --git a/backends/bevy_picking_ui/src/lib.rs b/backends/bevy_picking_ui/src/lib.rs index 97b12153..e7e7c96f 100644 --- a/backends/bevy_picking_ui/src/lib.rs +++ b/backends/bevy_picking_ui/src/lib.rs @@ -190,6 +190,6 @@ pub fn ui_picking( depth += 0.00001; // keep depth near 0 for precision } let order = camera.order as f32 + 0.5; // bevy ui can run on any camera, it's a special case - let _ = output.send(PointerHits::new(*pointer, picks, order)); + output.send(PointerHits::new(*pointer, picks, order)); } } diff --git a/crates/bevy_picking_core/src/events.rs b/crates/bevy_picking_core/src/events.rs index 21bc24bd..21a82144 100644 --- a/crates/bevy_picking_core/src/events.rs +++ b/crates/bevy_picking_core/src/events.rs @@ -228,7 +228,7 @@ pub fn pointer_events( .iter() .flat_map(|h| h.iter().map(|(entity, data)| (*entity, data.to_owned()))) { - let _ = pointer_move.send(Pointer::new( + pointer_move.send(Pointer::new( pointer_id, location.clone(), hovered_entity, @@ -255,7 +255,7 @@ pub fn pointer_events( ); continue; }; - let _ = pointer_up.send(Pointer::new( + pointer_up.send(Pointer::new( press_event.pointer_id, location, hovered_entity, @@ -276,7 +276,7 @@ pub fn pointer_events( ); continue; }; - let _ = pointer_down.send(Pointer::new( + pointer_down.send(Pointer::new( press_event.pointer_id, location, hovered_entity, @@ -301,7 +301,7 @@ pub fn pointer_events( error!("Unable to get location for pointer {:?}", pointer_id); continue; }; - let _ = pointer_over.send(Pointer::new( + pointer_over.send(Pointer::new( pointer_id, location, hovered_entity, @@ -325,7 +325,7 @@ pub fn pointer_events( error!("Unable to get location for pointer {:?}", pointer_id); continue; }; - let _ = pointer_out.send(Pointer::new( + pointer_out.send(Pointer::new( pointer_id, location, hovered_entity, @@ -397,7 +397,7 @@ pub fn send_click_and_drag_events( latest_pos: down.pointer_location.position, }, ); - let _ = pointer_drag_start.send(Pointer::new( + pointer_drag_start.send(Pointer::new( pointer_id, down.pointer_location.clone(), down.target, @@ -415,7 +415,7 @@ pub fn send_click_and_drag_events( delta: location.position - drag.latest_pos, }; drag.latest_pos = location.position; - let _ = pointer_drag.send(Pointer::new( + pointer_drag.send(Pointer::new( pointer_id, location.clone(), *dragged_entity, @@ -526,7 +526,7 @@ pub fn send_drag_over_events( dragged: *drag_target, hit: hit.clone(), }; - let _ = pointer_drag_enter.send(Pointer::new( + pointer_drag_enter.send(Pointer::new( pointer_id, pointer_location.clone(), target, @@ -553,7 +553,7 @@ pub fn send_drag_over_events( |&&drag_target| target != drag_target, /* can't drag over itself */ ) { - let _ = pointer_drag_over.send(Pointer::new( + pointer_drag_over.send(Pointer::new( pointer_id, pointer_location.clone(), target, @@ -624,7 +624,7 @@ pub fn send_drag_over_events( continue; }; for drag_target in drag_list.keys() { - let _ = pointer_drag_leave.send(Pointer::new( + pointer_drag_leave.send(Pointer::new( pointer_id, pointer_location.clone(), target, diff --git a/crates/bevy_picking_input/src/mouse.rs b/crates/bevy_picking_input/src/mouse.rs index d42b0df5..252c021e 100644 --- a/crates/bevy_picking_input/src/mouse.rs +++ b/crates/bevy_picking_input/src/mouse.rs @@ -57,10 +57,10 @@ pub fn mouse_pick_events( match input.state { ButtonState::Pressed => { - let _ = pointer_presses.send(InputPress::new_down(PointerId::Mouse, button)); + pointer_presses.send(InputPress::new_down(PointerId::Mouse, button)); } ButtonState::Released => { - let _ = pointer_presses.send(InputPress::new_up(PointerId::Mouse, button)); + pointer_presses.send(InputPress::new_up(PointerId::Mouse, button)); } } } diff --git a/crates/bevy_picking_input/src/touch.rs b/crates/bevy_picking_input/src/touch.rs index 72c7421a..c159b68e 100644 --- a/crates/bevy_picking_input/src/touch.rs +++ b/crates/bevy_picking_input/src/touch.rs @@ -71,7 +71,7 @@ pub fn touch_pick_events( TouchPhase::Ended | TouchPhase::Canceled => { input_presses.send(InputPress::new_up(pointer, PointerButton::Primary)); location_cache.remove(&touch.id); - let _ = cancel_events.send(PointerCancel { + cancel_events.send(PointerCancel { pointer_id: pointer, }); } diff --git a/crates/bevy_picking_selection/src/lib.rs b/crates/bevy_picking_selection/src/lib.rs index cb728070..eaa7adeb 100644 --- a/crates/bevy_picking_selection/src/lib.rs +++ b/crates/bevy_picking_selection/src/lib.rs @@ -157,7 +157,7 @@ pub fn send_selection_events( for (entity, selection) in selectables.iter() { let not_click_target = *target != entity; if selection.is_selected && not_click_target { - let _ = deselections.send(Pointer::new( + deselections.send(Pointer::new( *pointer_id, pointer_location.to_owned(), entity, @@ -189,7 +189,7 @@ pub fn send_selection_events( if !pointer_down_list.contains(&id) && !multiselect { for (entity, selection) in selectables.iter() { if selection.is_selected { - let _ = deselections.send(Pointer::new(id, location.clone(), entity, Deselect)); + deselections.send(Pointer::new(id, location.clone(), entity, Deselect)); } } } @@ -213,7 +213,7 @@ pub fn send_selection_events( if multiselect { match selection.is_selected { true => { - let _ = deselections.send(Pointer::new( + deselections.send(Pointer::new( *pointer_id, pointer_location.to_owned(), entity, @@ -221,7 +221,7 @@ pub fn send_selection_events( )); }, false => { - let _ = selections.send(Pointer::new( + selections.send(Pointer::new( *pointer_id, pointer_location.to_owned(), entity, @@ -230,7 +230,7 @@ pub fn send_selection_events( }, }; } else if !selection.is_selected { - let _ = selections.send(Pointer::new( + selections.send(Pointer::new( *pointer_id, pointer_location.to_owned(), entity,