From 23e6d1823b0e1e7be58a82c111507c7cdfcd79f2 Mon Sep 17 00:00:00 2001 From: Francis De Brabandere Date: Thu, 5 Dec 2024 10:53:58 +0100 Subject: [PATCH] style: new clippy rules --- src/vpx/expanded.rs | 5 +++-- src/vpx/gamedata.rs | 4 ++-- src/vpx/gameitem/hittarget.rs | 2 +- src/vpx/gameitem/kicker.rs | 2 +- src/vpx/gameitem/light.rs | 4 ++-- src/vpx/gameitem/plunger.rs | 2 +- src/vpx/gameitem/ramp.rs | 2 +- src/vpx/gameitem/ramp_image_alignment.rs | 2 +- src/vpx/gameitem/textbox.rs | 2 +- src/vpx/gameitem/trigger.rs | 2 +- src/vpx/material.rs | 2 +- src/vpx/mod.rs | 3 ++- src/vpx/renderprobe.rs | 4 ++-- 13 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/vpx/expanded.rs b/src/vpx/expanded.rs index 81433db..62e21d7 100644 --- a/src/vpx/expanded.rs +++ b/src/vpx/expanded.rs @@ -1688,10 +1688,11 @@ mod test { assert_eq!(2, read_compressed_data.width); assert_eq!(2, read_compressed_data.height); - Ok(assert_eq!( + assert_eq!( LZW_COMPRESSED_DATA, *read_compressed_data.lzw_compressed_data - )) + ); + Ok(()) } #[test] diff --git a/src/vpx/gamedata.rs b/src/vpx/gamedata.rs index 3d4c055..6fc8305 100644 --- a/src/vpx/gamedata.rs +++ b/src/vpx/gamedata.rs @@ -69,7 +69,7 @@ impl<'de> Deserialize<'de> for ViewLayoutMode { { struct ViewLayoutModeVisitor; - impl<'de> serde::de::Visitor<'de> for ViewLayoutModeVisitor { + impl serde::de::Visitor<'_> for ViewLayoutModeVisitor { type Value = ViewLayoutMode; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { @@ -227,7 +227,7 @@ impl<'de> Deserialize<'de> for ToneMapper { { struct ToneMapperVisitor; - impl<'de> serde::de::Visitor<'de> for ToneMapperVisitor { + impl serde::de::Visitor<'_> for ToneMapperVisitor { type Value = ToneMapper; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { diff --git a/src/vpx/gameitem/hittarget.rs b/src/vpx/gameitem/hittarget.rs index 949519f..4207171 100644 --- a/src/vpx/gameitem/hittarget.rs +++ b/src/vpx/gameitem/hittarget.rs @@ -81,7 +81,7 @@ impl<'de> Deserialize<'de> for TargetType { { struct TargetTypeVisitor; - impl<'de> serde::de::Visitor<'de> for TargetTypeVisitor { + impl serde::de::Visitor<'_> for TargetTypeVisitor { type Value = TargetType; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { diff --git a/src/vpx/gameitem/kicker.rs b/src/vpx/gameitem/kicker.rs index 36b0146..2a095c0 100644 --- a/src/vpx/gameitem/kicker.rs +++ b/src/vpx/gameitem/kicker.rs @@ -72,7 +72,7 @@ impl<'de> Deserialize<'de> for KickerType { { struct KickerTypeVisitor; - impl<'de> serde::de::Visitor<'de> for KickerTypeVisitor { + impl serde::de::Visitor<'_> for KickerTypeVisitor { type Value = KickerType; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { diff --git a/src/vpx/gameitem/light.rs b/src/vpx/gameitem/light.rs index e27ca0c..203e985 100644 --- a/src/vpx/gameitem/light.rs +++ b/src/vpx/gameitem/light.rs @@ -56,7 +56,7 @@ impl<'de> Deserialize<'de> for ShadowMode { { struct ShadowModeVisitor; - impl<'de> serde::de::Visitor<'de> for ShadowModeVisitor { + impl serde::de::Visitor<'_> for ShadowModeVisitor { type Value = ShadowMode; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { @@ -148,7 +148,7 @@ impl<'de> Deserialize<'de> for Fader { { struct FaderVisitor; - impl<'de> serde::de::Visitor<'de> for FaderVisitor { + impl serde::de::Visitor<'_> for FaderVisitor { type Value = Fader; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { diff --git a/src/vpx/gameitem/plunger.rs b/src/vpx/gameitem/plunger.rs index b2425c5..629256f 100644 --- a/src/vpx/gameitem/plunger.rs +++ b/src/vpx/gameitem/plunger.rs @@ -61,7 +61,7 @@ impl<'de> Deserialize<'de> for PlungerType { { struct PlungerTypeVisitor; - impl<'de> serde::de::Visitor<'de> for PlungerTypeVisitor { + impl serde::de::Visitor<'_> for PlungerTypeVisitor { type Value = PlungerType; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { diff --git a/src/vpx/gameitem/ramp.rs b/src/vpx/gameitem/ramp.rs index 8e35569..a7f7219 100644 --- a/src/vpx/gameitem/ramp.rs +++ b/src/vpx/gameitem/ramp.rs @@ -68,7 +68,7 @@ impl<'de> Deserialize<'de> for RampType { { struct RampTypeVisitor; - impl<'de> serde::de::Visitor<'de> for RampTypeVisitor { + impl serde::de::Visitor<'_> for RampTypeVisitor { type Value = RampType; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { diff --git a/src/vpx/gameitem/ramp_image_alignment.rs b/src/vpx/gameitem/ramp_image_alignment.rs index d929f1b..3bb6774 100644 --- a/src/vpx/gameitem/ramp_image_alignment.rs +++ b/src/vpx/gameitem/ramp_image_alignment.rs @@ -54,7 +54,7 @@ impl<'de> Deserialize<'de> for RampImageAlignment { { struct RampImageAlignmentVisitor; - impl<'de> serde::de::Visitor<'de> for RampImageAlignmentVisitor { + impl serde::de::Visitor<'_> for RampImageAlignmentVisitor { type Value = RampImageAlignment; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { diff --git a/src/vpx/gameitem/textbox.rs b/src/vpx/gameitem/textbox.rs index 7d6e99f..c33fe2d 100644 --- a/src/vpx/gameitem/textbox.rs +++ b/src/vpx/gameitem/textbox.rs @@ -61,7 +61,7 @@ impl<'de> Deserialize<'de> for TextAlignment { { struct TextAlignmentVisitor; - impl<'de> serde::de::Visitor<'de> for TextAlignmentVisitor { + impl serde::de::Visitor<'_> for TextAlignmentVisitor { type Value = TextAlignment; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { diff --git a/src/vpx/gameitem/trigger.rs b/src/vpx/gameitem/trigger.rs index 3df1dfe..0b1e549 100644 --- a/src/vpx/gameitem/trigger.rs +++ b/src/vpx/gameitem/trigger.rs @@ -77,7 +77,7 @@ impl<'de> Deserialize<'de> for TriggerShape { { struct TriggerShapeVisitor; - impl<'de> serde::de::Visitor<'de> for TriggerShapeVisitor { + impl serde::de::Visitor<'_> for TriggerShapeVisitor { type Value = TriggerShape; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { diff --git a/src/vpx/material.rs b/src/vpx/material.rs index f18c3ab..5761645 100644 --- a/src/vpx/material.rs +++ b/src/vpx/material.rs @@ -63,7 +63,7 @@ impl<'de> Deserialize<'de> for MaterialType { { struct MaterialTypeVisitor; - impl<'de> serde::de::Visitor<'de> for MaterialTypeVisitor { + impl serde::de::Visitor<'_> for MaterialTypeVisitor { type Value = MaterialType; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { diff --git a/src/vpx/mod.rs b/src/vpx/mod.rs index 2f83192..8d94fee 100644 --- a/src/vpx/mod.rs +++ b/src/vpx/mod.rs @@ -1083,7 +1083,8 @@ mod tests { let read = read_gamedata(&mut comp2, &version)?; - Ok(assert_eq!(original, read)) + assert_eq!(original, read); + Ok(()) } #[test] diff --git a/src/vpx/renderprobe.rs b/src/vpx/renderprobe.rs index 553433f..b19984b 100644 --- a/src/vpx/renderprobe.rs +++ b/src/vpx/renderprobe.rs @@ -35,7 +35,7 @@ impl<'de> Deserialize<'de> for RenderProbeType { D: serde::de::Deserializer<'de>, { struct RenderProbeTypeVisitor; - impl<'de> serde::de::Visitor<'de> for RenderProbeTypeVisitor { + impl serde::de::Visitor<'_> for RenderProbeTypeVisitor { type Value = RenderProbeType; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { @@ -163,7 +163,7 @@ impl<'de> Deserialize<'de> for ReflectionMode { D: serde::de::Deserializer<'de>, { struct ReflectionModeVisitor; - impl<'de> serde::de::Visitor<'de> for ReflectionModeVisitor { + impl serde::de::Visitor<'_> for ReflectionModeVisitor { type Value = ReflectionMode; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {