From 8749ccfd139817d112d69aa13799a53d09e5a0b0 Mon Sep 17 00:00:00 2001 From: Fyor Klein Gunnewiek Date: Tue, 7 Mar 2023 13:02:58 +0100 Subject: [PATCH] Resolve clippy errors. --- src/framework/communication/configuration_directory.rs | 2 +- src/vision/modules/perspective_grid_candidates_provider.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/framework/communication/configuration_directory.rs b/src/framework/communication/configuration_directory.rs index a4c1edb2..aae147e3 100644 --- a/src/framework/communication/configuration_directory.rs +++ b/src/framework/communication/configuration_directory.rs @@ -84,7 +84,7 @@ fn from_path>(file_path: P) -> anyhow::Result { fn merge_json(own: &mut Value, other: &Value) { match (own, other) { - (&mut Value::Object(ref mut own), &Value::Object(ref other)) => { + (&mut Value::Object(ref mut own), Value::Object(other)) => { for (key, value) in other { merge_json(own.entry(key.clone()).or_insert(Value::Null), value); } diff --git a/src/vision/modules/perspective_grid_candidates_provider.rs b/src/vision/modules/perspective_grid_candidates_provider.rs index 08615065..747a3dbc 100644 --- a/src/vision/modules/perspective_grid_candidates_provider.rs +++ b/src/vision/modules/perspective_grid_candidates_provider.rs @@ -74,7 +74,7 @@ impl PerspectiveGridCandidatesProvider { let mut rows = vec![]; - while row_vertical_center >= higher_horizon_point.y as f32 + while row_vertical_center >= higher_horizon_point.y && row_vertical_center + ball_radius > 0.0 { radius444 = camera_matrix