Skip to content

Commit d4f4a2c

Browse files
committed
Clippy nightly
1 parent e131df2 commit d4f4a2c

File tree

8 files changed

+18
-20
lines changed

8 files changed

+18
-20
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl Main {
3333
mob_timer.stop();
3434

3535
let hud = unsafe { owner.get_node_as_instance::<hud::Hud>("hud").unwrap() };
36-
hud.map(|x, o| x.show_game_over(&*o))
36+
hud.map(|x, o| x.show_game_over(&o))
3737
.ok()
3838
.unwrap_or_else(|| godot_print!("Unable to get hud"));
3939
}
@@ -51,16 +51,16 @@ impl Main {
5151
self.score = 0;
5252

5353
player
54-
.map(|x, o| x.start(&*o, start_position.position()))
54+
.map(|x, o| x.start(&o, start_position.position()))
5555
.ok()
5656
.unwrap_or_else(|| godot_print!("Unable to get player"));
5757

5858
start_timer.start(0.0);
5959

6060
let hud = unsafe { owner.get_node_as_instance::<hud::Hud>("hud").unwrap() };
6161
hud.map(|x, o| {
62-
x.update_score(&*o, self.score);
63-
x.show_message(&*o, "Get Ready".into());
62+
x.update_score(&o, self.score);
63+
x.show_message(&o, "Get Ready".into());
6464
})
6565
.ok()
6666
.unwrap_or_else(|| godot_print!("Unable to get hud"));
@@ -79,7 +79,7 @@ impl Main {
7979
self.score += 1;
8080

8181
let hud = unsafe { owner.get_node_as_instance::<hud::Hud>("hud").unwrap() };
82-
hud.map(|x, o| x.update_score(&*o, self.score))
82+
hud.map(|x, o| x.update_score(&o, self.score))
8383
.ok()
8484
.unwrap_or_else(|| godot_print!("Unable to get hud"));
8585
}

examples/resource/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl Greeter {
4141
fn _ready(&self) {
4242
if let Some(greeting_resource) = self.greeting_resource.as_ref() {
4343
let greeting_resource = unsafe { greeting_resource.assume_safe() };
44-
greeting_resource.map(|s, o| s.say_hello(&*o)).unwrap();
44+
greeting_resource.map(|s, o| s.say_hello(&o)).unwrap();
4545
}
4646
}
4747
}

examples/scene-create/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use gdnative::prelude::*;
22

3-
#[derive(Debug, Clone, PartialEq)]
3+
#[derive(Debug, Clone, Eq, PartialEq)]
44
pub enum ManageErrs {
55
CouldNotMakeInstance,
66
RootClassNotSpatial(String),

gdnative-core/src/core_types/string.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ mod serialize {
660660
where
661661
S: Serializer,
662662
{
663-
serializer.serialize_str(&*self.to_string())
663+
serializer.serialize_str(&self.to_string())
664664
}
665665
}
666666

gdnative-core/src/export/method.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -579,16 +579,14 @@ impl fmt::Debug for IndexBounds {
579579
impl fmt::Display for IndexBounds {
580580
#[inline]
581581
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
582-
match self.start {
583-
Some(start) => write!(f, "{}", start)?,
584-
None => {}
582+
if let Some(start) = self.start {
583+
write!(f, "{}", start)?
585584
}
586585

587586
write!(f, "..=")?;
588587

589-
match self.end {
590-
Some(end) => write!(f, "{}", end)?,
591-
None => {}
588+
if let Some(end) = self.end {
589+
write!(f, "{}", end)?
592590
}
593591

594592
Ok(())

gdnative-core/src/export/user_data.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ where
679679
where
680680
F: FnOnce(&Self::Target) -> U,
681681
{
682-
self.inner.try_borrow().map(|r| op(&*r))
682+
self.inner.try_borrow().map(|r| op(&r))
683683
}
684684
}
685685

@@ -694,7 +694,7 @@ where
694694
where
695695
F: FnOnce(&mut Self::Target) -> U,
696696
{
697-
self.inner.try_borrow_mut().map(|mut w| op(&mut *w))
697+
self.inner.try_borrow_mut().map(|mut w| op(&mut w))
698698
}
699699
}
700700

test/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,13 @@ impl Foo {
148148

149149
godot_itest! { test_rust_class_construction {
150150
let foo = Foo::new_instance();
151-
assert_eq!(Ok(42), foo.map(|foo, owner| { foo.answer(&*owner) }));
151+
assert_eq!(Ok(42), foo.map(|foo, owner| { foo.answer(&owner) }));
152152

153153
let base = foo.into_base();
154154
assert_eq!(Some(42), unsafe { base.call("answer", &[]).to() });
155155

156156
let foo = Instance::<Foo, _>::try_from_base(base).expect("should be able to downcast");
157-
assert_eq!(Ok(42), foo.map(|foo, owner| { foo.answer(&*owner) }));
157+
assert_eq!(Ok(42), foo.map(|foo, owner| { foo.answer(&owner) }));
158158

159159
let base = foo.into_base();
160160
assert!(Instance::<NotFoo, _>::try_from_base(base).is_err());

test/src/test_derive.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,14 +216,14 @@ impl EmplacementOnly {
216216

217217
crate::godot_itest! { test_derive_nativeclass_without_constructor {
218218
let foo = Instance::emplace(EmplacementOnly(54));
219-
assert_eq!(Ok(54), foo.map(|foo, owner| { foo.answer(&*owner) }));
219+
assert_eq!(Ok(54), foo.map(|foo, owner| { foo.answer(&owner) }));
220220

221221
let base = foo.into_base();
222222
assert_eq!(Some(54), unsafe { base.call("answer", &[]).to::<i64>() });
223223

224224
let foo = Instance::<EmplacementOnly, _>::try_from_base(base)
225225
.expect("should be able to downcast");
226-
assert_eq!(Ok(54), foo.map(|foo, owner| { foo.answer(&*owner) }));
226+
assert_eq!(Ok(54), foo.map(|foo, owner| { foo.answer(&owner) }));
227227
}}
228228

229229
// ----------------------------------------------------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)