fix clippy warnings

[nihav.git] / nihav-core / src / muxers / mod.rs

diff --git a/nihav-core/src/muxers/mod.rs b/nihav-core/src/muxers/mod.rs
index 40a6eb353f919f7cb5f7d3a601d82222b32af170..eb71df5ec36b2f7e57ee10f013ed5470bc2b112c 100644 (file)
--- a/nihav-core/src/muxers/mod.rs
+++ b/nihav-core/src/muxers/mod.rs
@@ -74,10 +74,10 @@ pub struct Muxer<'a> {
 
 impl<'a> Muxer<'a> {
     /// Constructs a new `Muxer` instance.
-    fn new(mux: Box<dyn MuxCore<'a> + 'a>, str: StreamManager) -> Self {
+    fn new(mux: Box<dyn MuxCore<'a> + 'a>, strmgr: StreamManager) -> Self {
         Muxer {
             mux,
-            streams:    str,
+            streams:    strmgr,
         }
     }
     /// Returns a stream reference by its number.
@@ -134,10 +134,10 @@ pub trait MuxerCreator {
 }
 
 /// Creates muxer for a provided bytestream writer.
-pub fn create_muxer<'a>(mxcr: &dyn MuxerCreator, str: StreamManager, bw: &'a mut ByteWriter<'a>) -> MuxerResult<Muxer<'a>> {
+pub fn create_muxer<'a>(mxcr: &dyn MuxerCreator, strmgr: StreamManager, bw: &'a mut ByteWriter<'a>) -> MuxerResult<Muxer<'a>> {
     let mut mux = mxcr.new_muxer(bw);
-    mux.create(&str)?;
-    Ok(Muxer::new(mux, str))
+    mux.create(&strmgr)?;
+    Ok(Muxer::new(mux, strmgr))
 }
 
 /// List of registered muxers.
@@ -157,12 +157,7 @@ impl RegisteredMuxers {
     }
     /// Searches for a muxer that supports requested container format.
     pub fn find_muxer(&self, name: &str) -> Option<&dyn MuxerCreator> {
-        for &mux in self.muxes.iter() {
-            if mux.get_name() == name {
-                return Some(mux);
-            }
-        }
-        None
+        self.muxes.iter().find(|&&mux| mux.get_name() == name).copied()
     }
     /// Provides an iterator over currently registered muxers.
     pub fn iter(&self) -> std::slice::Iter<&dyn MuxerCreator> {