From eb0a804a50935181f6b7fcdb9f5ceb0a776a4e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 8 Oct 2018 15:02:23 +0300 Subject: [PATCH] Run everything through latest rustfmt --- examples/src/bin/appsink.rs | 6 ++- examples/src/bin/appsrc.rs | 3 +- examples/src/bin/decodebin.rs | 6 ++- examples/src/bin/encodebin.rs | 6 ++- examples/src/bin/futures.rs | 3 +- examples/src/bin/glib-futures.rs | 3 +- examples/src/bin/pad_probes.rs | 6 ++- examples/src/bin/pango-cairo.rs | 6 ++- examples/src/bin/playbin.rs | 3 +- examples/src/bin/queries.rs | 6 ++- examples/src/bin/rtpfecclient.rs | 27 +++++++----- examples/src/bin/rtpfecserver.rs | 21 +++++---- gstreamer-net/src/net_client_clock.rs | 6 ++- gstreamer-net/src/ntp_clock.rs | 6 ++- gstreamer-net/src/ptp_clock.rs | 6 ++- gstreamer/src/buffer_serde.rs | 6 ++- gstreamer/src/bufferlist_serde.rs | 3 +- gstreamer/src/caps.rs | 3 +- gstreamer/src/caps_serde.rs | 18 +++++--- gstreamer/src/clock.rs | 3 +- gstreamer/src/event.rs | 3 +- gstreamer/src/ghost_pad.rs | 3 +- gstreamer/src/iterator.rs | 3 +- gstreamer/src/message.rs | 9 ++-- gstreamer/src/object.rs | 3 +- gstreamer/src/pad.rs | 24 +++++++---- gstreamer/src/query.rs | 3 +- gstreamer/src/sample_serde.rs | 6 ++- gstreamer/src/segment_serde.rs | 3 +- gstreamer/src/structure_serde.rs | 6 ++- gstreamer/src/tags_serde.rs | 3 +- gstreamer/src/toc_serde.rs | 3 +- gstreamer/src/typefind.rs | 6 ++- gstreamer/src/value_serde.rs | 6 ++- tutorials/src/bin/basic-tutorial-4.rs | 51 +++++++++++----------- tutorials/src/bin/basic-tutorial-5.rs | 61 ++++++++++++++++----------- tutorials/src/bin/basic-tutorial-7.rs | 3 +- tutorials/src/bin/basic-tutorial-8.rs | 6 ++- 38 files changed, 217 insertions(+), 132 deletions(-) diff --git a/examples/src/bin/appsink.rs b/examples/src/bin/appsink.rs index 0916c0daf..6c9023283 100644 --- a/examples/src/bin/appsink.rs +++ b/examples/src/bin/appsink.rs @@ -115,12 +115,14 @@ fn create_pipeline() -> Result { .map(|sample| { let f = f64::from(*sample) / f64::from(i16::MAX); f * f - }).sum(); + }) + .sum(); let rms = (sum / (samples.len() as f64)).sqrt(); println!("rms: {}", rms); gst::FlowReturn::Ok - }).build(), + }) + .build(), ); Ok(pipeline) diff --git a/examples/src/bin/appsrc.rs b/examples/src/bin/appsrc.rs index d415ccafa..604baba21 100644 --- a/examples/src/bin/appsrc.rs +++ b/examples/src/bin/appsrc.rs @@ -105,7 +105,8 @@ fn create_pipeline() -> Result { // appsrc already handles the error here let _ = appsrc.push_buffer(buffer); - }).build(), + }) + .build(), ); Ok(pipeline) diff --git a/examples/src/bin/decodebin.rs b/examples/src/bin/decodebin.rs index 2c0e5e889..13e69570f 100644 --- a/examples/src/bin/decodebin.rs +++ b/examples/src/bin/decodebin.rs @@ -178,7 +178,8 @@ fn example_main() -> Result<(), Error> { .and_then(|v| { v.downcast_ref::>>>() .and_then(|v| v.lock().unwrap().take()) - }).map(Result::Err) + }) + .map(Result::Err) .expect("error-details message without actual error"), _ => Err(ErrorMessage { src: err @@ -188,7 +189,8 @@ fn example_main() -> Result<(), Error> { error: err.get_error().description().into(), debug: err.get_debug(), cause: err.get_error(), - }.into()), + } + .into()), }?; } #[cfg(not(feature = "v1_10"))] diff --git a/examples/src/bin/encodebin.rs b/examples/src/bin/encodebin.rs index d46fa6bbe..0cd4e1b12 100644 --- a/examples/src/bin/encodebin.rs +++ b/examples/src/bin/encodebin.rs @@ -236,7 +236,8 @@ fn example_main() -> Result<(), Error> { .and_then(|v| { v.downcast_ref::>>>() .and_then(|v| v.lock().unwrap().take()) - }).map(Result::Err) + }) + .map(Result::Err) .expect("error-details message without actual error"), _ => Err(ErrorMessage { src: err @@ -246,7 +247,8 @@ fn example_main() -> Result<(), Error> { error: err.get_error().description().into(), debug: err.get_debug(), cause: err.get_error(), - }.into()), + } + .into()), }?; } #[cfg(not(feature = "v1_10"))] diff --git a/examples/src/bin/futures.rs b/examples/src/bin/futures.rs index eeca1553d..ffc59bfdb 100644 --- a/examples/src/bin/futures.rs +++ b/examples/src/bin/futures.rs @@ -44,7 +44,8 @@ fn example_main() { } else { Ok(()) } - }).and_then(|_| Ok(())); + }) + .and_then(|_| Ok(())); let _ = block_on(messages); diff --git a/examples/src/bin/glib-futures.rs b/examples/src/bin/glib-futures.rs index a556d2156..94ebef574 100644 --- a/examples/src/bin/glib-futures.rs +++ b/examples/src/bin/glib-futures.rs @@ -47,7 +47,8 @@ fn example_main() { } else { Ok(()) } - }).and_then(|_| Ok(())); + }) + .and_then(|_| Ok(())); let _ = ctx.block_on(messages); diff --git a/examples/src/bin/pad_probes.rs b/examples/src/bin/pad_probes.rs index 692ee34aa..493860280 100644 --- a/examples/src/bin/pad_probes.rs +++ b/examples/src/bin/pad_probes.rs @@ -16,7 +16,8 @@ fn example_main() { let pipeline = gst::parse_launch(&format!( "audiotestsrc name=src ! audio/x-raw,format={},channels=1 ! fakesink", gst_audio::AUDIO_FORMAT_S16.to_string() - )).unwrap(); + )) + .unwrap(); let pipeline = pipeline.dynamic_cast::().unwrap(); let src = pipeline.get_by_name("src").unwrap(); @@ -36,7 +37,8 @@ fn example_main() { .map(|sample| { let f = f64::from(*sample) / f64::from(i16::MAX); f * f - }).sum(); + }) + .sum(); let rms = (sum / (samples.len() as f64)).sqrt(); println!("rms: {}", rms); } diff --git a/examples/src/bin/pango-cairo.rs b/examples/src/bin/pango-cairo.rs index d0a3bbe5d..46ce1ed7f 100644 --- a/examples/src/bin/pango-cairo.rs +++ b/examples/src/bin/pango-cairo.rs @@ -146,7 +146,8 @@ fn create_pipeline() -> Result { } None - }).unwrap(); + }) + .unwrap(); let drawer_clone = drawer.clone(); overlay @@ -159,7 +160,8 @@ fn create_pipeline() -> Result { drawer.info = Some(gst_video::VideoInfo::from_caps(&caps).unwrap()); None - }).unwrap(); + }) + .unwrap(); Ok(pipeline) } diff --git a/examples/src/bin/playbin.rs b/examples/src/bin/playbin.rs index 8eccd13c9..5d0bb0c7a 100644 --- a/examples/src/bin/playbin.rs +++ b/examples/src/bin/playbin.rs @@ -60,7 +60,8 @@ fn example_main() { } None - }).unwrap(); + }) + .unwrap(); let bus = playbin.get_bus().unwrap(); diff --git a/examples/src/bin/queries.rs b/examples/src/bin/queries.rs index cf0fe729c..cb5cc79f8 100644 --- a/examples/src/bin/queries.rs +++ b/examples/src/bin/queries.rs @@ -39,7 +39,8 @@ fn example_main() { } else { None } - }.and_then(|pos| pos.try_into_time().ok()) + } + .and_then(|pos| pos.try_into_time().ok()) .unwrap(); let dur = { @@ -49,7 +50,8 @@ fn example_main() { } else { None } - }.and_then(|dur| dur.try_into_time().ok()) + } + .and_then(|dur| dur.try_into_time().ok()) .unwrap(); println!("{} / {}", pos, dur); diff --git a/examples/src/bin/rtpfecclient.rs b/examples/src/bin/rtpfecclient.rs index 3272ea3f6..ee8082be7 100644 --- a/examples/src/bin/rtpfecclient.rs +++ b/examples/src/bin/rtpfecclient.rs @@ -172,7 +172,8 @@ fn example_main() -> Result<(), Error> { ("clock-rate", &90000i32), ("is-fec", &true), ], - ).to_value(), + ) + .to_value(), ), 96 => Some( gst::Caps::new_simple( @@ -182,7 +183,8 @@ fn example_main() -> Result<(), Error> { ("clock-rate", &90000i32), ("encoding-name", &"VP8"), ], - ).to_value(), + ) + .to_value(), ), _ => None, } @@ -266,17 +268,20 @@ fn example_main() -> Result<(), Error> { error: err.get_error().description().into(), debug: err.get_debug(), cause: err.get_error(), - }.into()); + } + .into()); } MessageView::StateChanged(s) => match msg.get_src() { - Some(element) => if element == pipeline && s.get_current() == gst::State::Playing { - eprintln!("PLAYING"); - gst::debug_bin_to_dot_file( - &pipeline, - gst::DebugGraphDetails::all(), - "client-playing", - ); - }, + Some(element) => { + if element == pipeline && s.get_current() == gst::State::Playing { + eprintln!("PLAYING"); + gst::debug_bin_to_dot_file( + &pipeline, + gst::DebugGraphDetails::all(), + "client-playing", + ); + } + } None => (), }, _ => (), diff --git a/examples/src/bin/rtpfecserver.rs b/examples/src/bin/rtpfecserver.rs index de78cc0d7..f352dedb2 100644 --- a/examples/src/bin/rtpfecserver.rs +++ b/examples/src/bin/rtpfecserver.rs @@ -199,17 +199,20 @@ fn example_main() -> Result<(), Error> { error: err.get_error().description().into(), debug: err.get_debug(), cause: err.get_error(), - }.into()); + } + .into()); } MessageView::StateChanged(s) => match msg.get_src() { - Some(element) => if element == pipeline && s.get_current() == gst::State::Playing { - eprintln!("PLAYING"); - gst::debug_bin_to_dot_file( - &pipeline, - gst::DebugGraphDetails::all(), - "server-playing", - ); - }, + Some(element) => { + if element == pipeline && s.get_current() == gst::State::Playing { + eprintln!("PLAYING"); + gst::debug_bin_to_dot_file( + &pipeline, + gst::DebugGraphDetails::all(), + "server-playing", + ); + } + } None => (), }, _ => (), diff --git a/gstreamer-net/src/net_client_clock.rs b/gstreamer-net/src/net_client_clock.rs index 4b73525db..a3a3366f0 100644 --- a/gstreamer-net/src/net_client_clock.rs +++ b/gstreamer-net/src/net_client_clock.rs @@ -31,7 +31,8 @@ impl NetClientClock { remote_address.to_glib_none().0, remote_port, base_time.to_glib(), - )).downcast_unchecked() + )) + .downcast_unchecked() } } else { // Workaround for bad floating reference handling in 1.12. This issue was fixed for 1.13 @@ -41,7 +42,8 @@ impl NetClientClock { remote_address.to_glib_none().0, remote_port, base_time.to_glib(), - )).downcast_unchecked() + )) + .downcast_unchecked() } } } diff --git a/gstreamer-net/src/ntp_clock.rs b/gstreamer-net/src/ntp_clock.rs index 1f9d81787..3b3727a20 100644 --- a/gstreamer-net/src/ntp_clock.rs +++ b/gstreamer-net/src/ntp_clock.rs @@ -31,7 +31,8 @@ impl NtpClock { remote_address.to_glib_none().0, remote_port, base_time.to_glib(), - )).downcast_unchecked() + )) + .downcast_unchecked() } } else { // Workaround for bad floating reference handling in 1.12. This issue was fixed for 1.13 @@ -41,7 +42,8 @@ impl NtpClock { remote_address.to_glib_none().0, remote_port, base_time.to_glib(), - )).downcast_unchecked() + )) + .downcast_unchecked() } } } diff --git a/gstreamer-net/src/ptp_clock.rs b/gstreamer-net/src/ptp_clock.rs index d6c10b435..343140a61 100644 --- a/gstreamer-net/src/ptp_clock.rs +++ b/gstreamer-net/src/ptp_clock.rs @@ -31,7 +31,8 @@ impl PtpClock { remote_address.to_glib_none().0, remote_port, base_time.to_glib(), - )).downcast_unchecked() + )) + .downcast_unchecked() } } else { // Workaround for bad floating reference handling in 1.12. This issue was fixed for 1.13 @@ -41,7 +42,8 @@ impl PtpClock { remote_address.to_glib_none().0, remote_port, base_time.to_glib(), - )).downcast_unchecked() + )) + .downcast_unchecked() } } } diff --git a/gstreamer/src/buffer_serde.rs b/gstreamer/src/buffer_serde.rs index 1b0e096f4..34c628f29 100644 --- a/gstreamer/src/buffer_serde.rs +++ b/gstreamer/src/buffer_serde.rs @@ -117,7 +117,8 @@ mod tests { " ),", " buffer: \"AQIDBA==\",", ")" - ).to_owned()), + ) + .to_owned()), res ); @@ -133,7 +134,8 @@ mod tests { "\"flags\":{\"bits\":1048592},", "\"buffer\":[1,2,3,4]", "}" - ).to_owned(), + ) + .to_owned(), res ); diff --git a/gstreamer/src/bufferlist_serde.rs b/gstreamer/src/bufferlist_serde.rs index 2082cf21d..2b10782af 100644 --- a/gstreamer/src/bufferlist_serde.rs +++ b/gstreamer/src/bufferlist_serde.rs @@ -131,7 +131,8 @@ mod tests { " buffer: \"BQY=\",", " ),", "]" - ).to_owned()), + ) + .to_owned()), res, ); } diff --git a/gstreamer/src/caps.rs b/gstreamer/src/caps.rs index a2a442da0..04f94bc20 100644 --- a/gstreamer/src/caps.rs +++ b/gstreamer/src/caps.rs @@ -579,7 +579,8 @@ mod tests { ("fraction", &Fraction::new(1, 2)), ("array", &Array::new(&[&1, &2])), ], - ).as_ref() + ) + .as_ref() ); } assert!( diff --git a/gstreamer/src/caps_serde.rs b/gstreamer/src/caps_serde.rs index 3b126701c..20e8a60de 100644 --- a/gstreamer/src/caps_serde.rs +++ b/gstreamer/src/caps_serde.rs @@ -264,7 +264,8 @@ mod tests { " ]),", " ]), None),", "])" - ).to_owned()), + ) + .to_owned()), res, ); @@ -298,7 +299,8 @@ mod tests { " \"foo:baz\",", " ]))),", "])" - ).to_owned()), + ) + .to_owned()), res, ); @@ -329,7 +331,8 @@ mod tests { " ]),", " ]), Some(Any)),", "])" - ).to_owned()), + ) + .to_owned()), res, ); @@ -385,7 +388,8 @@ mod tests { ("fraction", &Fraction::new(1, 2)), ("array", &Array::new(&[&1, &2])), ], - ).as_ref() + ) + .as_ref() ); let caps_ron = r#" @@ -417,7 +421,8 @@ mod tests { ("fraction", &Fraction::new(1, 2)), ("array", &Array::new(&[&1, &2])), ], - ).as_ref() + ) + .as_ref() ); let f = caps.get_features(0).unwrap(); assert!(f.is_equal(CapsFeatures::new(&["foo:bar", "foo:baz"]).as_ref())); @@ -451,7 +456,8 @@ mod tests { ("fraction", &Fraction::new(1, 2)), ("array", &Array::new(&[&1, &2])), ], - ).as_ref() + ) + .as_ref() ); let f = caps.get_features(0).unwrap(); assert!(f.is_any()); diff --git a/gstreamer/src/clock.rs b/gstreamer/src/clock.rs index 10cfeab91..8553b85f1 100644 --- a/gstreamer/src/clock.rs +++ b/gstreamer/src/clock.rs @@ -43,7 +43,8 @@ unsafe extern "C" fn trampoline_wait_async( &from_glib_borrow(clock), from_glib(time), &from_glib_borrow(id), - ).to_glib() + ) + .to_glib() } unsafe extern "C" fn destroy_closure_wait_async(ptr: gpointer) { diff --git a/gstreamer/src/event.rs b/gstreamer/src/event.rs index 7bee1328e..54d57cb67 100644 --- a/gstreamer/src/event.rs +++ b/gstreamer/src/event.rs @@ -452,7 +452,8 @@ impl fmt::Debug for EventRef { .field("type", &unsafe { let type_ = ffi::gst_event_type_get_name((*self.as_ptr()).type_); CStr::from_ptr(type_).to_str().unwrap() - }).field("seqnum", &self.get_seqnum()) + }) + .field("seqnum", &self.get_seqnum()) .field("structure", &self.get_structure()) .finish() } diff --git a/gstreamer/src/ghost_pad.rs b/gstreamer/src/ghost_pad.rs index cdf13272f..ac0d1f5fd 100644 --- a/gstreamer/src/ghost_pad.rs +++ b/gstreamer/src/ghost_pad.rs @@ -40,7 +40,8 @@ impl GhostPad { name.0, target.to_glib_none().0, templ.to_glib_none().0, - )).map(|o| Downcast::downcast_unchecked(o)) + )) + .map(|o| Downcast::downcast_unchecked(o)) } } diff --git a/gstreamer/src/iterator.rs b/gstreamer/src/iterator.rs index 3056a2619..b2a56c456 100644 --- a/gstreamer/src/iterator.rs +++ b/gstreamer/src/iterator.rs @@ -384,7 +384,8 @@ unsafe extern "C" fn filter_boxed_get_type() -> glib_ff "GstRsIteratorFilterBoxed-{}-{}", T::static_type().name(), idx - )).unwrap(); + )) + .unwrap(); if gobject_ffi::g_type_from_name(type_name.as_ptr()) == gobject_ffi::G_TYPE_INVALID { break type_name; diff --git a/gstreamer/src/message.rs b/gstreamer/src/message.rs index f548b4360..1fb9cab08 100644 --- a/gstreamer/src/message.rs +++ b/gstreamer/src/message.rs @@ -348,7 +348,8 @@ impl fmt::Debug for MessageRef { .field("type", &unsafe { let type_ = ffi::gst_message_type_get_name((*self.as_ptr()).type_); CStr::from_ptr(type_).to_str().unwrap() - }).field("seqnum", &self.get_seqnum()) + }) + .field("seqnum", &self.get_seqnum()) .field("src", &self.get_src().map(|s| s.get_name())) .field("structure", &self.get_structure()) .finish() @@ -1092,7 +1093,8 @@ impl<'a> StreamsSelected<'a> { self.as_mut_ptr(), i, )) - }).collect() + }) + .collect() } } } @@ -1129,7 +1131,8 @@ impl<'a> Redirect<'a> { from_glib_none(tags), structure, ) - }).collect() + }) + .collect() } } } diff --git a/gstreamer/src/object.rs b/gstreamer/src/object.rs index d1ddb647b..562797b60 100644 --- a/gstreamer/src/object.rs +++ b/gstreamer/src/object.rs @@ -60,7 +60,8 @@ impl + IsA + glib::value::SetValue> GstObjectExtM f(&obj, &prop_obj, &pspec); None - }).unwrap() + }) + .unwrap() } } diff --git a/gstreamer/src/pad.rs b/gstreamer/src/pad.rs index cddffc1ff..47e0567aa 100644 --- a/gstreamer/src/pad.rs +++ b/gstreamer/src/pad.rs @@ -1023,7 +1023,8 @@ unsafe extern "C" fn trampoline_activatemode_function( &from_glib_borrow(parent), from_glib(mode), from_glib(active), - ).to_glib() + ) + .to_glib() } unsafe extern "C" fn trampoline_chain_function( @@ -1041,7 +1042,8 @@ unsafe extern "C" fn trampoline_chain_function( &from_glib_borrow(pad), &from_glib_borrow(parent), from_glib_full(buffer), - ).to_glib() + ) + .to_glib() } unsafe extern "C" fn trampoline_chain_list_function( @@ -1059,7 +1061,8 @@ unsafe extern "C" fn trampoline_chain_list_function( &from_glib_borrow(pad), &from_glib_borrow(parent), from_glib_full(list), - ).to_glib() + ) + .to_glib() } unsafe extern "C" fn trampoline_event_function( @@ -1075,7 +1078,8 @@ unsafe extern "C" fn trampoline_event_function( &from_glib_borrow(pad), &from_glib_borrow(parent), from_glib_full(event), - ).to_glib() + ) + .to_glib() } unsafe extern "C" fn trampoline_event_full_function( @@ -1093,7 +1097,8 @@ unsafe extern "C" fn trampoline_event_full_function( &from_glib_borrow(pad), &from_glib_borrow(parent), from_glib_full(event), - ).to_glib() + ) + .to_glib() } unsafe extern "C" fn trampoline_getrange_function( @@ -1154,7 +1159,8 @@ unsafe extern "C" fn trampoline_link_function( &from_glib_borrow(pad), &from_glib_borrow(parent), &from_glib_borrow(peer), - ).to_glib() + ) + .to_glib() } unsafe extern "C" fn trampoline_query_function( @@ -1172,7 +1178,8 @@ unsafe extern "C" fn trampoline_query_function( &from_glib_borrow(pad), &from_glib_borrow(parent), ::QueryRef::from_mut_ptr(query), - ).to_glib() + ) + .to_glib() } unsafe extern "C" fn trampoline_unlink_function( @@ -1276,7 +1283,8 @@ mod tests { sender.send(i).unwrap(); pad_clone.pause_task().unwrap(); } - }).unwrap(); + }) + .unwrap(); assert_eq!(receiver.recv().unwrap(), 3); } diff --git a/gstreamer/src/query.rs b/gstreamer/src/query.rs index 960b9f6b6..a82092575 100644 --- a/gstreamer/src/query.rs +++ b/gstreamer/src/query.rs @@ -209,7 +209,8 @@ impl fmt::Debug for QueryRef { .field("type", &unsafe { let type_ = ffi::gst_query_type_get_name((*self.as_ptr()).type_); CStr::from_ptr(type_).to_str().unwrap() - }).field("structure", &self.get_structure()) + }) + .field("structure", &self.get_structure()) .finish() } } diff --git a/gstreamer/src/sample_serde.rs b/gstreamer/src/sample_serde.rs index 5dd5e8d56..c3be5c8d7 100644 --- a/gstreamer/src/sample_serde.rs +++ b/gstreamer/src/sample_serde.rs @@ -173,7 +173,8 @@ mod tests { " (\"f3\", \"i32\", 123),", " ])),", ")" - ).to_owned()), + ) + .to_owned()), res ); @@ -225,7 +226,8 @@ mod tests { " )),", " info: None,", ")" - ).to_owned()), + ) + .to_owned()), res ); } diff --git a/gstreamer/src/segment_serde.rs b/gstreamer/src/segment_serde.rs index 69acc3ed4..fcaf22580 100644 --- a/gstreamer/src/segment_serde.rs +++ b/gstreamer/src/segment_serde.rs @@ -158,7 +158,8 @@ mod tests { " position: 256,", " duration: -1,", ")" - ).to_owned()), + ) + .to_owned()), res, ); } diff --git a/gstreamer/src/structure_serde.rs b/gstreamer/src/structure_serde.rs index bde72ecfc..57d75cd9b 100644 --- a/gstreamer/src/structure_serde.rs +++ b/gstreamer/src/structure_serde.rs @@ -197,7 +197,8 @@ mod tests { " (\"i32\", 2),", " ]),", "])" - ).to_owned()), + ) + .to_owned()), res, ); } @@ -229,7 +230,8 @@ mod tests { ("fraction", &Fraction::new(1, 2)), ("array", &Array::new(&[&1, &2])), ], - ).as_ref() + ) + .as_ref() ); } diff --git a/gstreamer/src/tags_serde.rs b/gstreamer/src/tags_serde.rs index 6d1f763f1..b456edd9d 100644 --- a/gstreamer/src/tags_serde.rs +++ b/gstreamer/src/tags_serde.rs @@ -336,7 +336,8 @@ mod tests { " ),", " ]),", "]", - ).to_owned()), + ) + .to_owned()), res, ); } diff --git a/gstreamer/src/toc_serde.rs b/gstreamer/src/toc_serde.rs index f0597929a..fd1e3e7a7 100644 --- a/gstreamer/src/toc_serde.rs +++ b/gstreamer/src/toc_serde.rs @@ -268,7 +268,8 @@ mod tests { " ),", " ],", ")", - ).to_owned()), + ) + .to_owned()), res, ); } diff --git a/gstreamer/src/typefind.rs b/gstreamer/src/typefind.rs index c6181bf20..9b40aa9ad 100644 --- a/gstreamer/src/typefind.rs +++ b/gstreamer/src/typefind.rs @@ -248,8 +248,10 @@ mod tests { c.get_structure(0) .map(|s| s.get_name() == "application/xml") .unwrap_or(false) - }).unwrap_or(false) - }).unwrap(); + }) + .unwrap_or(false) + }) + .unwrap(); let data = b"test"; let data = &data[..]; diff --git a/gstreamer/src/value_serde.rs b/gstreamer/src/value_serde.rs index e5d553ae4..446a2ac97 100644 --- a/gstreamer/src/value_serde.rs +++ b/gstreamer/src/value_serde.rs @@ -348,7 +348,8 @@ mod tests { " (\"Fraction\", (1, 2)),", " (\"String\", \"test str\"),", "]" - ).to_owned()), + ) + .to_owned()), res, ); @@ -374,7 +375,8 @@ mod tests { " (\"Fraction\", (1, 2)),", " (\"String\", \"test str\"),", "]" - ).to_owned()), + ) + .to_owned()), res, ); } diff --git a/tutorials/src/bin/basic-tutorial-4.rs b/tutorials/src/bin/basic-tutorial-4.rs index 4b08e39a6..58158a17d 100644 --- a/tutorials/src/bin/basic-tutorial-4.rs +++ b/tutorials/src/bin/basic-tutorial-4.rs @@ -82,7 +82,8 @@ fn tutorial_main() { .seek_simple( gst::SeekFlags::FLUSH | gst::SeekFlags::KEY_UNIT, 30 * gst::SECOND, - ).expect("Failed to seek."); + ) + .expect("Failed to seek."); custom_data.seek_done = true; } } @@ -114,35 +115,37 @@ fn handle_message(custom_data: &mut CustomData, msg: &gst::GstRc if state_changed - .get_src() - .map(|s| s == custom_data.playbin) - .unwrap_or(false) - { - let new_state = state_changed.get_current(); - let old_state = state_changed.get_old(); + MessageView::StateChanged(state_changed) => { + if state_changed + .get_src() + .map(|s| s == custom_data.playbin) + .unwrap_or(false) + { + let new_state = state_changed.get_current(); + let old_state = state_changed.get_old(); - println!( - "Pipeline state changed from {:?} to {:?}", - old_state, new_state - ); + println!( + "Pipeline state changed from {:?} to {:?}", + old_state, new_state + ); - custom_data.playing = new_state == gst::State::Playing; - if custom_data.playing { - let mut seeking = gst::Query::new_seeking(gst::Format::Time); - if custom_data.playbin.query(&mut seeking) { - let (seekable, start, end) = seeking.get_result(); - custom_data.seek_enabled = seekable; - if seekable { - println!("Seeking is ENABLED from {:?} to {:?}", start, end) + custom_data.playing = new_state == gst::State::Playing; + if custom_data.playing { + let mut seeking = gst::Query::new_seeking(gst::Format::Time); + if custom_data.playbin.query(&mut seeking) { + let (seekable, start, end) = seeking.get_result(); + custom_data.seek_enabled = seekable; + if seekable { + println!("Seeking is ENABLED from {:?} to {:?}", start, end) + } else { + println!("Seeking is DISABLED for this stream.") + } } else { - println!("Seeking is DISABLED for this stream.") + eprintln!("Seeking query failed.") } - } else { - eprintln!("Seeking query failed.") } } - }, + } _ => (), } } diff --git a/tutorials/src/bin/basic-tutorial-5.rs b/tutorials/src/bin/basic-tutorial-5.rs index 232f1bbd2..5615d6cf3 100644 --- a/tutorials/src/bin/basic-tutorial-5.rs +++ b/tutorials/src/bin/basic-tutorial-5.rs @@ -50,35 +50,43 @@ mod tutorial5 { let signame: &str = &format!("get-{}-tags", stype); match playbin.get_property(propname).unwrap().get() { - Some(x) => for i in 0..x { - let tags = playbin.emit(signame, &[&i]).unwrap().unwrap(); + Some(x) => { + for i in 0..x { + let tags = playbin.emit(signame, &[&i]).unwrap().unwrap(); - if let Some(tags) = tags.get::() { - textbuf.insert_at_cursor(&format!("{} stream {}:\n ", stype, i)); + if let Some(tags) = tags.get::() { + textbuf.insert_at_cursor(&format!("{} stream {}:\n ", stype, i)); - if let Some(codec) = tags.get::() { - textbuf - .insert_at_cursor(&format!(" codec: {} \n", codec.get().unwrap())); - } + if let Some(codec) = tags.get::() { + textbuf.insert_at_cursor(&format!( + " codec: {} \n", + codec.get().unwrap() + )); + } - if let Some(codec) = tags.get::() { - textbuf - .insert_at_cursor(&format!(" codec: {} \n", codec.get().unwrap())); - } + if let Some(codec) = tags.get::() { + textbuf.insert_at_cursor(&format!( + " codec: {} \n", + codec.get().unwrap() + )); + } - if let Some(lang) = tags.get::() { - textbuf - .insert_at_cursor(&format!(" language: {} \n", lang.get().unwrap())); - } + if let Some(lang) = tags.get::() { + textbuf.insert_at_cursor(&format!( + " language: {} \n", + lang.get().unwrap() + )); + } - if let Some(bitrate) = tags.get::() { - textbuf.insert_at_cursor(&format!( - " bitrate: {} \n", - bitrate.get().unwrap() - )); + if let Some(bitrate) = tags.get::() { + textbuf.insert_at_cursor(&format!( + " bitrate: {} \n", + bitrate.get().unwrap() + )); + } } } - }, + } None => { eprintln!("Could not get {}!", propname); } @@ -328,21 +336,24 @@ mod tutorial5 { let pipeline = args[0].get::().unwrap(); post_app_message(&pipeline); None - }).unwrap(); + }) + .unwrap(); playbin .connect("audio-tags-changed", false, |args| { let pipeline = args[0].get::().unwrap(); post_app_message(&pipeline); None - }).unwrap(); + }) + .unwrap(); playbin .connect("text-tags-changed", false, move |args| { let pipeline = args[0].get::().unwrap(); post_app_message(&pipeline); None - }).unwrap(); + }) + .unwrap(); let window = create_ui(&playbin); diff --git a/tutorials/src/bin/basic-tutorial-7.rs b/tutorials/src/bin/basic-tutorial-7.rs index 08fb2ff7a..b7d7b44a7 100644 --- a/tutorials/src/bin/basic-tutorial-7.rs +++ b/tutorials/src/bin/basic-tutorial-7.rs @@ -40,7 +40,8 @@ fn tutorial_main() { &visual, &video_convert, &video_sink, - ]).unwrap(); + ]) + .unwrap(); gst::Element::link_many(&[&audio_source, &tee]).unwrap(); gst::Element::link_many(&[&audio_queue, &audio_convert, &audio_resample, &audio_sink]).unwrap(); diff --git a/tutorials/src/bin/basic-tutorial-8.rs b/tutorials/src/bin/basic-tutorial-8.rs index ade447e93..32d2fe176 100644 --- a/tutorials/src/bin/basic-tutorial-8.rs +++ b/tutorials/src/bin/basic-tutorial-8.rs @@ -86,7 +86,8 @@ fn main() { &video_sink, &app_queue, &appsink, - ]).unwrap(); + ]) + .unwrap(); gst::Element::link_many(&[&appsrc, &tee]).unwrap(); gst::Element::link_many(&[&audio_queue, &audio_convert1, &audio_resample, &audio_sink]) @@ -97,7 +98,8 @@ fn main() { &visual, &video_convert, &video_sink, - ]).unwrap(); + ]) + .unwrap(); gst::Element::link_many(&[&app_queue, &appsink]).unwrap(); let tee_audio_pad = tee.get_request_pad("src_%u").unwrap();