diff options
| author | Kostya Shishkov <kostya.shiskov@gmail.com> | 2020-09-27 13:24:03 +0200 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shiskov@gmail.com> | 2020-09-27 13:24:03 +0200 |
| commit | ac818eac7671fa8ddfea5aa4fb86fc0b5ab82d2e (patch) | |
| tree | 5ac952c45b747fbe5df9c71b08237a409d9f1d7a /nihav-commonfmt | |
| parent | 73f0f89ff3a3616a8e65b5a31c2303725994c56a (diff) | |
| download | nihav-ac818eac7671fa8ddfea5aa4fb86fc0b5ab82d2e.tar.gz | |
fix some warnings (unneeded parentheses, missing dyn keyword)
Diffstat (limited to 'nihav-commonfmt')
| -rw-r--r-- | nihav-commonfmt/src/demuxers/mod.rs | 2 | ||||
| -rw-r--r-- | nihav-commonfmt/src/demuxers/wav.rs | 2 | ||||
| -rw-r--r-- | nihav-commonfmt/src/muxers/mod.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nihav-commonfmt/src/demuxers/mod.rs b/nihav-commonfmt/src/demuxers/mod.rs index ba8a8df..d602cfc 100644 --- a/nihav-commonfmt/src/demuxers/mod.rs +++ b/nihav-commonfmt/src/demuxers/mod.rs @@ -15,7 +15,7 @@ mod mov; #[cfg(feature="demuxer_wav")] mod wav; -const DEMUXERS: &[&DemuxerCreator] = &[ +const DEMUXERS: &[&dyn DemuxerCreator] = &[ #[cfg(feature="demuxer_avi")] &avi::AVIDemuxerCreator {}, #[cfg(feature="demuxer_mov")] diff --git a/nihav-commonfmt/src/demuxers/wav.rs b/nihav-commonfmt/src/demuxers/wav.rs index a579279..ce6318a 100644 --- a/nihav-commonfmt/src/demuxers/wav.rs +++ b/nihav-commonfmt/src/demuxers/wav.rs @@ -25,7 +25,7 @@ impl<'a> DemuxCore<'a> for WAVDemuxer<'a> { fn open(&mut self, strmgr: &mut StreamManager, seek_index: &mut SeekIndex) -> DemuxerResult<()> { let riff = self.src.read_u32be()?; let riff_size = self.src.read_u32le()? as usize; - let riff_end = self.src.tell() + if riff_size > 0 { (riff_size as u64) } else { u64::from(std::u32::MAX) }; + let riff_end = self.src.tell() + if riff_size > 0 { riff_size as u64 } else { u64::from(std::u32::MAX) }; let wave = self.src.read_u32be()?; validate!(riff == mktag!(b"RIFF")); validate!(wave == mktag!(b"WAVE")); diff --git a/nihav-commonfmt/src/muxers/mod.rs b/nihav-commonfmt/src/muxers/mod.rs index 5865172..6df929c 100644 --- a/nihav-commonfmt/src/muxers/mod.rs +++ b/nihav-commonfmt/src/muxers/mod.rs @@ -5,7 +5,7 @@ mod avi; #[cfg(feature="muxer_wav")] mod wav; -const MUXERS: &[&MuxerCreator] = &[ +const MUXERS: &[&dyn MuxerCreator] = &[ #[cfg(feature="muxer_avi")] &avi::AVIMuxerCreator {}, #[cfg(feature="muxer_wav")] |