game: fix some clippy warnings

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

diff --git a/nihav-game/src/demuxers/mod.rs b/nihav-game/src/demuxers/mod.rs
index 9d7d18728ceb0c85ac55c5d45eb2844dd040ea5e..7dca6d236e0ece6c186074b18acbc79007d45678 100644 (file)
--- a/nihav-game/src/demuxers/mod.rs
+++ b/nihav-game/src/demuxers/mod.rs
@@ -5,16 +5,18 @@ macro_rules! validate {
     ($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DemuxerError::InvalidData); } };
 }
 
-#[cfg(feature="demuxer_bmv")]
+#[cfg(any(feature="demuxer_bmv",feature="demuxer_bmv3"))]
 mod bmv;
 #[cfg(feature="demuxer_gdv")]
 mod gdv;
 #[cfg(feature="demuxer_vmd")]
 mod vmd;
 
-const GAME_DEMUXERS: &[&'static DemuxerCreator] = &[
+const GAME_DEMUXERS: &[&DemuxerCreator] = &[
 #[cfg(feature="demuxer_bmv")]
     &bmv::BMVDemuxerCreator {},
+#[cfg(feature="demuxer_bmv3")]
+    &bmv::BMV3DemuxerCreator {},
 #[cfg(feature="demuxer_gdv")]
     &gdv::GDVDemuxerCreator {},
 #[cfg(feature="demuxer_vmd")]
@@ -22,7 +24,7 @@ const GAME_DEMUXERS: &[&'static DemuxerCreator] = &[
 ];
 
 pub fn game_register_all_demuxers(rd: &mut RegisteredDemuxers) {
-    for demuxer in GAME_DEMUXERS.into_iter() {
+    for demuxer in GAME_DEMUXERS.iter() {
         rd.add_demuxer(*demuxer);
     }
 }