Merge #919

919: Clippy nightly fixes r=Bromeon a=Bromeon



Co-authored-by: Jan Haller <bromeon@gmail.com>

Author: bors[bot]

examples/dodge-the-creeps/src/main_scene.rs

@@ -33,7 +33,7 @@ impl Main {
         mob_timer.stop();
 
         let hud = unsafe { owner.get_node_as_instance::<hud::Hud>("hud").unwrap() };
-        hud.map(|x, o| x.show_game_over(&*o))
+        hud.map(|x, o| x.show_game_over(&o))
             .ok()
             .unwrap_or_else(|| godot_print!("Unable to get hud"));
     }
@@ -51,16 +51,16 @@ impl Main {
         self.score = 0;
 
         player
-            .map(|x, o| x.start(&*o, start_position.position()))
+            .map(|x, o| x.start(&o, start_position.position()))
             .ok()
             .unwrap_or_else(|| godot_print!("Unable to get player"));
 
         start_timer.start(0.0);
 
         let hud = unsafe { owner.get_node_as_instance::<hud::Hud>("hud").unwrap() };
         hud.map(|x, o| {
-            x.update_score(&*o, self.score);
-            x.show_message(&*o, "Get Ready".into());
+            x.update_score(&o, self.score);
+            x.show_message(&o, "Get Ready".into());
         })
         .ok()
         .unwrap_or_else(|| godot_print!("Unable to get hud"));
@@ -79,7 +79,7 @@ impl Main {
         self.score += 1;
 
         let hud = unsafe { owner.get_node_as_instance::<hud::Hud>("hud").unwrap() };
-        hud.map(|x, o| x.update_score(&*o, self.score))
+        hud.map(|x, o| x.update_score(&o, self.score))
             .ok()
             .unwrap_or_else(|| godot_print!("Unable to get hud"));
     }

examples/resource/src/lib.rs

@@ -41,7 +41,7 @@ impl Greeter {
     fn _ready(&self) {
         if let Some(greeting_resource) = self.greeting_resource.as_ref() {
             let greeting_resource = unsafe { greeting_resource.assume_safe() };
-            greeting_resource.map(|s, o| s.say_hello(&*o)).unwrap();
+            greeting_resource.map(|s, o| s.say_hello(&o)).unwrap();
         }
     }
 }

examples/scene-create/src/lib.rs

@@ -1,6 +1,6 @@
 use gdnative::prelude::*;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub enum ManageErrs {
     CouldNotMakeInstance,
     RootClassNotSpatial(String),

gdnative-core/src/core_types/string.rs

@@ -660,7 +660,7 @@ mod serialize {
         where
             S: Serializer,
         {
-            serializer.serialize_str(&*self.to_string())
+            serializer.serialize_str(&self.to_string())
         }
     }
 

gdnative-core/src/export/method.rs

@@ -579,16 +579,14 @@ impl fmt::Debug for IndexBounds {
 impl fmt::Display for IndexBounds {
     #[inline]
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self.start {
-            Some(start) => write!(f, "{}", start)?,
-            None => {}
+        if let Some(start) = self.start {
+            write!(f, "{}", start)?
         }
 
         write!(f, "..=")?;
 
-        match self.end {
-            Some(end) => write!(f, "{}", end)?,
-            None => {}
+        if let Some(end) = self.end {
+            write!(f, "{}", end)?
         }
 
         Ok(())

gdnative-core/src/export/user_data.rs

@@ -679,7 +679,7 @@ where
     where
         F: FnOnce(&Self::Target) -> U,
     {
-        self.inner.try_borrow().map(|r| op(&*r))
+        self.inner.try_borrow().map(|r| op(&r))
     }
 }
 
@@ -694,7 +694,7 @@ where
     where
         F: FnOnce(&mut Self::Target) -> U,
     {
-        self.inner.try_borrow_mut().map(|mut w| op(&mut *w))
+        self.inner.try_borrow_mut().map(|mut w| op(&mut w))
     }
 }
 

test/src/lib.rs

@@ -148,13 +148,13 @@ impl Foo {
 
 godot_itest! { test_rust_class_construction {
     let foo = Foo::new_instance();
-    assert_eq!(Ok(42), foo.map(|foo, owner| { foo.answer(&*owner) }));
+    assert_eq!(Ok(42), foo.map(|foo, owner| { foo.answer(&owner) }));
 
     let base = foo.into_base();
     assert_eq!(Some(42), unsafe { base.call("answer", &[]).to() });
 
     let foo = Instance::<Foo, _>::try_from_base(base).expect("should be able to downcast");
-    assert_eq!(Ok(42), foo.map(|foo, owner| { foo.answer(&*owner) }));
+    assert_eq!(Ok(42), foo.map(|foo, owner| { foo.answer(&owner) }));
 
     let base = foo.into_base();
     assert!(Instance::<NotFoo, _>::try_from_base(base).is_err());

test/src/test_derive.rs

@@ -216,14 +216,14 @@ impl EmplacementOnly {
 
 crate::godot_itest! { test_derive_nativeclass_without_constructor {
     let foo = Instance::emplace(EmplacementOnly(54));
-    assert_eq!(Ok(54), foo.map(|foo, owner| { foo.answer(&*owner) }));
+    assert_eq!(Ok(54), foo.map(|foo, owner| { foo.answer(&owner) }));
 
     let base = foo.into_base();
     assert_eq!(Some(54), unsafe { base.call("answer", &[]).to::<i64>() });
 
     let foo = Instance::<EmplacementOnly, _>::try_from_base(base)
         .expect("should be able to downcast");
-    assert_eq!(Ok(54), foo.map(|foo, owner| { foo.answer(&*owner) }));
+    assert_eq!(Ok(54), foo.map(|foo, owner| { foo.answer(&owner) }));
 }}
 
 // ----------------------------------------------------------------------------------------------------------------------------------------------