Fix a few more clippy warnings

gst-plugin-cdg/src/lib.rs

@@ -19,7 +19,7 @@ mod constants;
 
 use constants::{CDG_COMMAND, CDG_MASK, CDG_PACKET_SIZE};
 
-const TYPEFIND_SEARCH_WINDOW: i64 = 100000; /* in bytes */
+const TYPEFIND_SEARCH_WINDOW: i64 = 100_000; /* in bytes */
 
 /* Return the percentage of CDG packets in the first @len bytes of @typefind */
 fn cdg_packets_ratio(typefind: &mut gst::TypeFind, len: i64) -> i64 {

gst-plugin-closedcaption/src/mcc_parse.rs

@@ -166,12 +166,11 @@ impl State {
             combine::easy::Errors<u8, &[u8], combine::stream::PointerOffset>,
         ),
     > {
-        let line = match self.replay_last_line {
+        let line = if self.replay_last_line {
-            true => {
             self.replay_last_line = false;
             &self.last_raw_line
-            }
+        } else {
-            false => match self.reader.get_line_with_drain(drain) {
+            match self.reader.get_line_with_drain(drain) {
                 None => {
                     return Ok(None);
                 }
@@ -179,7 +178,7 @@ impl State {
                     self.last_raw_line = line.to_vec();
                     line
                 }
-            },
+            }
         };
 
         self.parser
@@ -268,7 +267,7 @@ impl State {
         element: &gst::Element,
         buffer: &mut gst::buffer::Buffer,
         timecode: &gst_video::ValidVideoTimeCode,
-        framerate: &gst::Fraction,
+        framerate: gst::Fraction,
     ) {
         let buffer = buffer.get_mut().unwrap();
         gst_video::VideoTimeCodeMeta::add(buffer, &timecode);
@@ -293,7 +292,7 @@ impl State {
         &mut self,
         element: &gst::Element,
         format: Option<Format>,
-        framerate: &gst::Fraction,
+        framerate: gst::Fraction,
     ) -> Vec<gst::Event> {
         let mut events = Vec::new();
 
@@ -322,11 +321,11 @@ impl State {
                 let caps = match format {
                     Format::Cea708Cdp => gst::Caps::builder("closedcaption/x-cea-708")
                         .field("format", &"cdp")
-                        .field("framerate", framerate)
+                        .field("framerate", &framerate)
                         .build(),
                     Format::Cea608 => gst::Caps::builder("closedcaption/x-cea-608")
                         .field("format", &"s334-1a")
-                        .field("framerate", framerate)
+                        .field("framerate", &framerate)
                         .build(),
                 };
 
@@ -606,7 +605,7 @@ impl MccParse {
         mut state: MutexGuard<State>,
     ) -> Result<MutexGuard<State>, gst::FlowError> {
         let (framerate, drop_frame) = parse_timecode_rate(state.timecode_rate)?;
-        let events = state.create_events(element, Some(format), &framerate);
+        let events = state.create_events(element, Some(format), framerate);
         let timecode = state.handle_timecode(element, framerate, drop_frame, tc)?;
 
         let len = data[2] as usize;
@@ -616,7 +615,7 @@ impl MccParse {
             len,
         });
 
-        state.add_buffer_metadata(element, &mut buffer, &timecode, &framerate);
+        state.add_buffer_metadata(element, &mut buffer, &timecode, framerate);
 
         // Update the last_timecode to the current one
         state.last_timecode = Some(timecode);
@@ -780,14 +779,7 @@ impl MccParse {
                 reader.push(buf);
             }
 
-            loop {
+            while let Some(line) = reader.get_line_with_drain(true) {
-                let line = match reader.get_line_with_drain(true) {
-                    Some(line) => line,
-                    None => {
-                        break;
-                    }
-                };
-
                 match parser.parse_line(line, false).map_err(|err| (line, err)) {
                     Ok(MccLine::Caption(tc, None)) => {
                         let state = self.state.lock().unwrap();
@@ -829,7 +821,7 @@ impl MccParse {
 
         match parse_timecode_rate(state.timecode_rate) {
             Ok((framerate, _)) => {
-                let mut events = state.create_events(element, None, &framerate);
+                let mut events = state.create_events(element, None, framerate);
                 let mut eos_event = gst::Event::new_eos();
 
                 if state.seek_seqnum != gst::event::SEQNUM_INVALID {

gst-plugin-closedcaption/src/mcc_parser.rs

@@ -354,7 +354,7 @@ where
         )),
         token(b'\t'),
         if parse_payload {
-            mcc_payload().map(|v| Some(v)).right()
+            mcc_payload().map(Some).right()
         } else {
             skip_many(any()).map(|_| None).left()
         },

gst-plugin-threadshare/src/tcpclientsrc.rs

@@ -171,7 +171,7 @@ impl SocketRead for TcpClientReader {
         match socket.poll_read(buf) {
             Ok(Async::Ready(result)) => Ok(Async::Ready((result, None))),
             Ok(Async::NotReady) => Ok(Async::NotReady),
-            Err(result) => return Err(result),
+            Err(result) => Err(result),
         }
     }
 }