fix clippy warnings for update to rustc 1.46

[nihav.git] / nihav-game / src / codecs / mod.rs

diff --git a/nihav-game/src/codecs/mod.rs b/nihav-game/src/codecs/mod.rs
index 4952b13e0cd3d506100ae47a139d0508af41d757..3caa51c1ba232db68c5923e71c85e6b8c00ef49b 100644 (file)
--- a/nihav-game/src/codecs/mod.rs
+++ b/nihav-game/src/codecs/mod.rs
@@ -8,8 +8,12 @@ macro_rules! validate {
 pub mod bmv;
 #[cfg(feature="decoder_bmv3")]
 pub mod bmv3;
+#[cfg(any(feature="decoder_fstvid",feature="decoder_fstaud"))]
+pub mod futurevision;
 #[cfg(feature="decoder_gdvvid")]
 pub mod gremlinvideo;
+#[cfg(feature="decoder_imax")]
+pub mod imax;
 #[cfg(feature="decoder_lhst500f22")]
 pub mod lhst500f22;
 #[cfg(feature="decoder_midivid")]
@@ -19,6 +23,8 @@ pub mod midivid3;
 #[cfg(feature="decoder_vmd")]
 pub mod vmd;
 #[cfg(feature="decoder_vx")]
+#[allow(clippy::erasing_op)]
+#[allow(clippy::identity_op)]
 pub mod vx;
 
 const GAME_CODECS: &[DecoderInfo] = &[
@@ -34,6 +40,12 @@ const GAME_CODECS: &[DecoderInfo] = &[
     DecoderInfo { name: "bmv3-audio", get_decoder: bmv3::get_decoder_audio },
 #[cfg(feature="decoder_bmv3")]
     DecoderInfo { name: "bmv3-video", get_decoder: bmv3::get_decoder_video },
+#[cfg(feature="decoder_fstaud")]
+    DecoderInfo { name: "fst-audio", get_decoder: futurevision::get_decoder_audio },
+#[cfg(feature="decoder_fstvid")]
+    DecoderInfo { name: "fst-video", get_decoder: futurevision::get_decoder_video },
+#[cfg(feature="decoder_imax")]
+    DecoderInfo { name: "fable-imax", get_decoder: imax::get_decoder },
 #[cfg(feature="decoder_vmd")]
     DecoderInfo { name: "vmd-audio", get_decoder: vmd::get_decoder_audio },
 #[cfg(feature="decoder_vmd")]
@@ -53,6 +65,6 @@ const GAME_CODECS: &[DecoderInfo] = &[
 /// Registers all available codecs provided by this crate.
 pub fn game_register_all_decoders(rd: &mut RegisteredDecoders) {
     for decoder in GAME_CODECS.iter() {
-        rd.add_decoder(decoder.clone());
+        rd.add_decoder(*decoder);
     }
 }