fix clippy warnings

[nihav.git] / nihav-llaudio / src / demuxers / flacraw.rs

diff --git a/nihav-llaudio/src/demuxers/flacraw.rs b/nihav-llaudio/src/demuxers/flacraw.rs
index d86d14e1eb3efb6c7901a1c1ecc174c7e49786d0..dcdd5a5b9be9082cf4a7a971eaa0bc3f543ea00d 100644 (file)
--- a/nihav-llaudio/src/demuxers/flacraw.rs
+++ b/nihav-llaudio/src/demuxers/flacraw.rs
@@ -90,7 +90,7 @@ impl<'a> RawDemuxCore<'a> for FLACDemuxer<'a> {
         self.srate = srate;
 
         let base = if self.blk_samples != 0 { u32::from(self.blk_samples) } else { 1 };
-        let ahdr = NAAudioInfo::new(srate, channels as u8, SND_S16P_FORMAT, base as usize);
+        let ahdr = NAAudioInfo::new(srate, channels, SND_S16P_FORMAT, base as usize);
         let ainfo = NACodecInfo::new("flac", NACodecTypeInfo::Audio(ahdr), Some(streaminfo));
         strmgr.add_stream(NAStream::new(StreamType::Audio, 0, ainfo, base, srate, 0)).unwrap();
 
@@ -137,11 +137,7 @@ impl RawDemuxerCreator for FLACDemuxerCreator {
         if br.seek(SeekFrom::Start(0)).is_err() {
             return false;
         }
-        if let Ok([b'f', b'L', b'a', b'C']) = br.read_tag() {
-            true
-        } else {
-            false
-        }
+        matches!(br.read_tag(), Ok([b'f', b'L', b'a', b'C']))
     }
 }
 
@@ -154,6 +150,7 @@ mod test {
 
     #[test]
     fn test_flac_raw_demux() {
+        // sample: https://samples.mplayerhq.hu/A-codecs/lossless/luckynight.flac
         let mut file = File::open("assets/LLaudio/luckynight.flac").unwrap();
         let mut fr = FileReader::new_read(&mut file);
         let mut br = ByteReader::new(&mut fr);