X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fmuxers%2Frmvb%2Faudiostream.rs;fp=nihav-realmedia%2Fsrc%2Fmuxers%2Frmvb%2Faudiostream.rs;h=bd8d34e4faea2e1db8c609281955189a4d327439;hp=0e174a2729099524613bfbedf210cb69e78aa012;hb=e6aaad5c5273cd814b5748b7faf3751835a37217;hpb=625751036014b099fd9c126397bc973cb0543130

diff --git a/nihav-realmedia/src/muxers/rmvb/audiostream.rs b/nihav-realmedia/src/muxers/rmvb/audiostream.rs
index 0e174a2..bd8d34e 100644
--- a/nihav-realmedia/src/muxers/rmvb/audiostream.rs
+++ b/nihav-realmedia/src/muxers/rmvb/audiostream.rs
@@ -57,11 +57,7 @@ impl Interleaver for NoInterleaver {
     fn get_packet(&mut self) -> Option<(Vec<u8>, bool)> {
         let mut ret = None;
         std::mem::swap(&mut self.pkt, &mut ret);
-        if let Some(pkt) = ret {
-            Some((pkt, true))
-        } else {
-            None
-        }
+        ret.map(|pkt| (pkt, true))
     }
     fn flush(&mut self) {}
 }
@@ -117,7 +113,7 @@ impl Interleaver for Int4Interleaver {
             return false;
         }
         let pos = self.map[self.cur_frame];
-        self.buf[pos * self.frame_size..][..self.frame_size].copy_from_slice(&src);
+        self.buf[pos * self.frame_size..][..self.frame_size].copy_from_slice(src);
         self.cur_frame += 1;
         true
     }
@@ -217,7 +213,7 @@ impl Interleaver for GenericInterleaver {
             return false;
         }
         let pos = self.map[self.cur_frame];
-        self.buf[pos * self.frame_size..][..self.frame_size].copy_from_slice(&src);
+        self.buf[pos * self.frame_size..][..self.frame_size].copy_from_slice(src);
         self.cur_frame += 1;
         true
     }