diff --git a/generic/sodium/src/decrypter/imp.rs b/generic/sodium/src/decrypter/imp.rs index 37d547c1..63e511dd 100644 --- a/generic/sodium/src/decrypter/imp.rs +++ b/generic/sodium/src/decrypter/imp.rs @@ -461,7 +461,7 @@ impl Decrypter { self.sinkpad .pull_range(pull_offset, total_size) - .map_err(|err| { + .inspect_err(|&err| { match err { gst::FlowError::Flushing => { gst::debug!( @@ -482,8 +482,6 @@ impl Decrypter { ); } }; - - err }) } diff --git a/generic/sodium/src/encrypter/imp.rs b/generic/sodium/src/encrypter/imp.rs index 9119d59a..c922120b 100644 --- a/generic/sodium/src/encrypter/imp.rs +++ b/generic/sodium/src/encrypter/imp.rs @@ -192,9 +192,8 @@ impl Encrypter { drop(state_guard); for buffer in buffers { - self.srcpad.push(buffer).map_err(|err| { + self.srcpad.push(buffer).inspect_err(|&err| { gst::error!(CAT, imp = self, "Failed to push buffer {:?}", err); - err })?; } diff --git a/generic/threadshare/examples/standalone/src/imp.rs b/generic/threadshare/examples/standalone/src/imp.rs index ae6cc7ef..e1bc56fa 100644 --- a/generic/threadshare/examples/standalone/src/imp.rs +++ b/generic/threadshare/examples/standalone/src/imp.rs @@ -194,9 +194,8 @@ impl TaskImpl for SrcTask { } buffer }) - .map_err(|err| { + .inspect_err(|&err| { gst::error!(CAT, obj = self.elem, "Failed to acquire buffer {err}"); - err })?; debug_or_trace!(CAT, self.is_main_elem, obj = self.elem, "Forwarding buffer"); diff --git a/generic/threadshare/src/runtime/executor/scheduler.rs b/generic/threadshare/src/runtime/executor/scheduler.rs index 829b3803..f8ab9030 100644 --- a/generic/threadshare/src/runtime/executor/scheduler.rs +++ b/generic/threadshare/src/runtime/executor/scheduler.rs @@ -218,14 +218,12 @@ impl Scheduler { tasks_checked = 0; while tasks_checked < Self::MAX_SUCCESSIVE_TASKS { if let Ok(runnable) = self.tasks.pop_runnable() { - panic::catch_unwind(|| runnable.run()).map_err(|err| { + panic::catch_unwind(|| runnable.run()).inspect_err(|_err| { gst::error!( RUNTIME_CAT, "A task has panicked within Context {}", self.context_name ); - - err })?; tasks_checked += 1; diff --git a/generic/threadshare/src/runtime/pad.rs b/generic/threadshare/src/runtime/pad.rs index 3856f083..0ec692b7 100644 --- a/generic/threadshare/src/runtime/pad.rs +++ b/generic/threadshare/src/runtime/pad.rs @@ -224,14 +224,13 @@ impl PadSrcInner { pub async fn push(&self, buffer: gst::Buffer) -> Result { gst::log!(RUNTIME_CAT, obj = self.gst_pad, "Pushing {:?}", buffer); - let success = self.gst_pad.push(buffer).map_err(|err| { + let success = self.gst_pad.push(buffer).inspect_err(|&err| { gst::error!( RUNTIME_CAT, obj = self.gst_pad, "Failed to push Buffer to PadSrc: {:?}", err, ); - err })?; gst::log!( @@ -247,14 +246,13 @@ impl PadSrcInner { pub async fn push_list(&self, list: gst::BufferList) -> Result { gst::log!(RUNTIME_CAT, obj = self.gst_pad, "Pushing {:?}", list); - let success = self.gst_pad.push_list(list).map_err(|err| { + let success = self.gst_pad.push_list(list).inspect_err(|&err| { gst::error!( RUNTIME_CAT, obj = self.gst_pad, "Failed to push BufferList to PadSrc: {:?}", err, ); - err })?; gst::log!( diff --git a/generic/threadshare/src/runtime/task.rs b/generic/threadshare/src/runtime/task.rs index bd1e9a86..d1d3cd5f 100644 --- a/generic/threadshare/src/runtime/task.rs +++ b/generic/threadshare/src/runtime/task.rs @@ -1139,16 +1139,14 @@ impl StateMachine { self.pending_triggering_evt = Some(triggering_evt); return Ok(()); } - try_next_res = try_next_fut => try_next_res.map_err(|err| { + try_next_res = try_next_fut => try_next_res.inspect_err(|&err| { gst::debug!(RUNTIME_CAT, "TaskImpl::try_next returned {:?}", err); - err })?, } }; - self.task_impl.handle_item(item).await.map_err(|err| { + self.task_impl.handle_item(item).await.inspect_err(|&err| { gst::debug!(RUNTIME_CAT, "TaskImpl::handle_item returned {:?}", err); - err })?; } } diff --git a/net/hlssink3/src/hlsbasesink.rs b/net/hlssink3/src/hlsbasesink.rs index bed37d2a..b825e766 100644 --- a/net/hlssink3/src/hlsbasesink.rs +++ b/net/hlssink3/src/hlsbasesink.rs @@ -438,15 +438,13 @@ impl HlsBaseSink { context.old_segment_locations.push(location.to_string()); } - self.write_playlist(context).map(|res| { + self.write_playlist(context).inspect(|_res| { let s = gst::Structure::builder("hls-segment-added") .field("location", location) .field("running-time", running_time.unwrap()) .field("duration", duration) .build(); self.post_message(gst::message::Element::builder(s).src(&*self.obj()).build()); - - res }) } diff --git a/net/rtsp/src/rtspsrc/imp.rs b/net/rtsp/src/rtspsrc/imp.rs index d3cda200..15d2140d 100644 --- a/net/rtsp/src/rtspsrc/imp.rs +++ b/net/rtsp/src/rtspsrc/imp.rs @@ -1085,9 +1085,8 @@ impl RtspSrc { return Err(RtspError::InvalidMessage("Can't PLAY, no SETUP").into()); }; self.post_start("request", "PLAY request sent"); - let cseq = state.play(s).await.map_err(|err| { + let cseq = state.play(s).await.inspect_err(|_err| { self.post_cancelled("request", "PLAY request cancelled"); - err })?; expected_response = Some((Method::Play, cseq)); }, diff --git a/text/json/src/jsongstparse/imp.rs b/text/json/src/jsongstparse/imp.rs index cb4b902b..b78a3ced 100644 --- a/text/json/src/jsongstparse/imp.rs +++ b/text/json/src/jsongstparse/imp.rs @@ -274,11 +274,10 @@ impl JsonGstParse { self.srcpad.push_event(event); } - self.srcpad.push(buffer).map_err(|err| { + self.srcpad.push(buffer).inspect_err(|&err| { if err != gst::FlowError::Flushing { gst::error!(CAT, imp = self, "Pushing buffer returned {:?}", err); } - err })?; if send_eos { diff --git a/utils/fallbackswitch/src/fallbacksrc/imp.rs b/utils/fallbackswitch/src/fallbacksrc/imp.rs index 344215dc..bdefefef 100644 --- a/utils/fallbackswitch/src/fallbacksrc/imp.rs +++ b/utils/fallbackswitch/src/fallbacksrc/imp.rs @@ -768,15 +768,13 @@ impl ElementImpl for FallbackSrc { _ => (), } - self.parent_change_state(transition).map_err(|err| { + self.parent_change_state(transition).inspect_err(|_err| { gst::error!( CAT, imp = self, "Parent state change transition {:?} failed", transition ); - - err })?; // Change the source state manually here to be able to catch errors. State changes always diff --git a/video/closedcaption/src/mcc_parse/imp.rs b/video/closedcaption/src/mcc_parse/imp.rs index 1caea52a..689c79bd 100644 --- a/video/closedcaption/src/mcc_parse/imp.rs +++ b/video/closedcaption/src/mcc_parse/imp.rs @@ -531,11 +531,10 @@ impl MccParse { self.srcpad.push_event(event); } - self.srcpad.push(buffer).map_err(|err| { + self.srcpad.push(buffer).inspect_err(|&err| { if err != gst::FlowError::Flushing && err != gst::FlowError::Eos { gst::error!(CAT, imp = self, "Pushing buffer returned {:?}", err); } - err })?; if send_eos { diff --git a/video/closedcaption/src/mcc_parse/parser.rs b/video/closedcaption/src/mcc_parse/parser.rs index c6c76519..3f01d4f7 100644 --- a/video/closedcaption/src/mcc_parse/parser.rs +++ b/video/closedcaption/src/mcc_parse/parser.rs @@ -291,18 +291,16 @@ impl MccParser { match self.state { State::Header => header(&mut line) - .map(|v| { + .inspect(|_v| { self.state = State::EmptyAfterHeader; - v }) .map_err(|err| match err { winnow::error::ErrMode::Incomplete(_) => unreachable!(), winnow::error::ErrMode::Backtrack(e) | winnow::error::ErrMode::Cut(e) => e, }), State::EmptyAfterHeader => empty_line(&mut line) - .map(|v| { + .inspect(|_v| { self.state = State::Comments; - v }) .map_err(|err| match err { winnow::error::ErrMode::Incomplete(_) => unreachable!(), @@ -310,12 +308,10 @@ impl MccParser { }), State::Comments => alt((empty_line, comment)) .parse_next(&mut line) - .map(|v| { - if v == MccLine::Empty { + .inspect(|v| { + if *v == MccLine::Empty { self.state = State::Metadata; } - - v }) .map_err(|err| match err { winnow::error::ErrMode::Incomplete(_) => unreachable!(), @@ -323,12 +319,10 @@ impl MccParser { }), State::Metadata => alt((empty_line, uuid, time_code_rate, metadata)) .parse_next(&mut line) - .map(|v| { - if v == MccLine::Empty { + .inspect(|v| { + if *v == MccLine::Empty { self.state = State::Captions; } - - v }) .map_err(|err| match err { winnow::error::ErrMode::Incomplete(_) => unreachable!(), diff --git a/video/closedcaption/src/scc_parse/imp.rs b/video/closedcaption/src/scc_parse/imp.rs index f4e88983..9e72f579 100644 --- a/video/closedcaption/src/scc_parse/imp.rs +++ b/video/closedcaption/src/scc_parse/imp.rs @@ -444,11 +444,10 @@ impl SccParse { self.srcpad.push_event(event); } - self.srcpad.push_list(buffers).map_err(|err| { + self.srcpad.push_list(buffers).inspect_err(|&err| { if err != gst::FlowError::Flushing && err != gst::FlowError::Eos { gst::error!(CAT, imp = self, "Pushing buffer returned {:?}", err); } - err })?; if send_eos { diff --git a/video/closedcaption/src/scc_parse/parser.rs b/video/closedcaption/src/scc_parse/parser.rs index cdf45e7e..357a799e 100644 --- a/video/closedcaption/src/scc_parse/parser.rs +++ b/video/closedcaption/src/scc_parse/parser.rs @@ -137,18 +137,16 @@ impl SccParser { match self.state { State::Header => header(&mut line) - .map(|v| { + .inspect(|_v| { self.state = State::Empty; - v }) .map_err(|err| match err { winnow::error::ErrMode::Incomplete(_) => unreachable!(), winnow::error::ErrMode::Backtrack(e) | winnow::error::ErrMode::Cut(e) => e, }), State::Empty => empty_line(&mut line) - .map(|v| { + .inspect(|_v| { self.state = State::CaptionOrEmpty; - v }) .map_err(|err| match err { winnow::error::ErrMode::Incomplete(_) => unreachable!(), diff --git a/video/gtk4/src/sink/imp.rs b/video/gtk4/src/sink/imp.rs index e1056ed9..5ab2a5ca 100644 --- a/video/gtk4/src/sink/imp.rs +++ b/video/gtk4/src/sink/imp.rs @@ -675,11 +675,11 @@ impl VideoSinkImpl for PaintableSink { } } }; - let frame = - Frame::new(buffer, info, orientation, wrapped_context.as_ref()).map_err(|err| { + let frame = Frame::new(buffer, info, orientation, wrapped_context.as_ref()).inspect_err( + |_err| { gst::error!(CAT, imp = self, "Failed to map video frame"); - err - })?; + }, + )?; self.pending_frame.lock().unwrap().replace(frame); let sender = self.sender.lock().unwrap();