More clippy fixes, now that all crates are covered

Author: Bromeon

examples/dodge-the-creeps/rust/src/player.rs

@@ -103,8 +103,8 @@ impl GodotExt for Player {
         let change = velocity * delta as f32;
         let position = self.base.get_global_position() + change;
         let position = Vector2::new(
-            position.x.max(0.0).min(self.screen_size.x),
-            position.y.max(0.0).min(self.screen_size.y),
+            position.x.clamp(0.0, self.screen_size.x),
+            position.y.clamp(0.0, self.screen_size.y),
         );
         self.base.set_global_position(position);
     }

godot-core/src/macros.rs

@@ -414,6 +414,7 @@ macro_rules! gdext_ptrcall {
 
         <$($RetTy)+ as sys::GodotFfi>::write_sys(&ret_val, $ret);
         // FIXME should be inc_ref instead of forget
+        #[allow(clippy::forget_copy)]
         std::mem::forget(ret_val);
     };
 }

godot-ffi/src/lib.rs

@@ -29,7 +29,7 @@ mod plugins;
 #[doc(hidden)]
 pub use paste;
 
-pub use godot_ffi::{GodotFfi, GodotFuncMarshal};
+pub use crate::godot_ffi::{GodotFfi, GodotFuncMarshal};
 pub use gen::central::*;
 pub use gen::gdextension_interface::*;
 

itest/rust/build.rs

@@ -66,6 +66,7 @@ fn main() {
         #[class(init)]
         struct GenFfi {}
 
+        #[allow(clippy::bool_comparison)] // i == true
         #[godot::bind::godot_api]
         impl GenFfi {
             #(#methods)*
@@ -111,7 +112,7 @@ fn rustfmt_if_needed(out_files: Vec<std::path::PathBuf>) {
         Ok(_) => println!("Done."),
         Err(err) => {
             println!("Failed.");
-            println!("Error: {}", err);
+            println!("Error: {err}");
         }
     }
 }

itest/rust/src/builtin_test.rs

@@ -28,7 +28,7 @@ fn test_builtins_vector2() {
     assert_eq!(abs, Vector2::new(3.0, 4.0));
 
     let normalized = inner.is_normalized();
-    assert_eq!(normalized, false);
+    assert!(!normalized);
 }
 
 #[itest]
@@ -54,7 +54,7 @@ fn test_builtins_callable() {
     let cb = Callable::from_object_method(obj.share(), "set_position");
     let inner: InnerCallable = cb.as_inner();
 
-    assert_eq!(inner.is_null(), false);
+    assert!(!inner.is_null());
     assert_eq!(inner.get_object_id(), obj.instance_id().to_i64());
     assert_eq!(inner.get_method(), StringName::from("set_position"));
 

itest/rust/src/enum_test.rs

@@ -6,7 +6,7 @@
 
 use crate::itest;
 use godot::engine::input::CursorShape;
-use godot::engine::{file_access, time};
+use godot::engine::time;
 use std::collections::HashSet;
 
 pub fn run() -> bool {
@@ -43,10 +43,10 @@ fn enum_ords_correct() {
 fn enum_equality() {
     // TODO: find 2 overlapping ords in same enum
 
-    assert_eq!(
-        file_access::CompressionMode::COMPRESSION_DEFLATE,
-        file_access::CompressionMode::COMPRESSION_DEFLATE
-    );
+    // assert_eq!(
+    //     file_access::CompressionMode::COMPRESSION_DEFLATE,
+    //     file_access::CompressionMode::COMPRESSION_DEFLATE
+    // );
 }
 
 #[itest]

itest/rust/src/lib.rs

@@ -72,7 +72,6 @@ pub(crate) fn expect_panic(context: &str, code: impl FnOnce() + UnwindSafe) {
     let panic = std::panic::catch_unwind(code);
     assert!(
         panic.is_err(),
-        "code should have panicked but did not: {}",
-        context
+        "code should have panicked but did not: {context}",
     );
 }

itest/rust/src/object_test.rs

@@ -243,12 +243,12 @@ fn object_engine_up_deref_mut() {
 
     // DerefMut chain: Gd<Node3D> -> &mut Node3D -> &mut Node -> &mut Object
     node3d.set_message_translation(true);
-    assert_eq!(node3d.can_translate_messages(), true);
+    assert!(node3d.can_translate_messages());
 
     // DerefMut chain: &mut Node3D -> ...
     let node3d_ref = &mut *node3d;
     node3d_ref.set_message_translation(false);
-    assert_eq!(node3d_ref.can_translate_messages(), false);
+    assert!(!node3d_ref.can_translate_messages());
 
     node3d.free();
 }

itest/rust/src/variant_test.rs

@@ -316,15 +316,13 @@ where
     for rel in true_rels {
         assert!(
             rel,
-            "total_order(rel=true, lhs={:?}, rhs={:?}, exp={:?})",
-            lhs, rhs, expected_order
+            "total_order(rel=true, lhs={lhs:?}, rhs={rhs:?}, exp={expected_order:?})",
         );
     }
     for rel in false_rels {
         assert!(
             !rel,
-            "total_order(rel=false, lhs={:?}, rhs={:?}, exp={:?})",
-            lhs, rhs, expected_order
+            "total_order(rel=false, lhs={lhs:?}, rhs={rhs:?}, exp={expected_order:?})",
         );
     }
 }