diff --git a/examples/src/bin/appsink.rs b/examples/src/bin/appsink.rs index ed3393fd6..5b91eb4de 100644 --- a/examples/src/bin/appsink.rs +++ b/examples/src/bin/appsink.rs @@ -32,7 +32,8 @@ struct ErrorMessage { src: String, error: String, debug: Option, - #[cause] cause: glib::Error, + #[cause] + cause: glib::Error, } fn create_pipeline() -> Result { diff --git a/examples/src/bin/appsrc.rs b/examples/src/bin/appsrc.rs index 337404f54..e36e58bab 100644 --- a/examples/src/bin/appsrc.rs +++ b/examples/src/bin/appsrc.rs @@ -28,7 +28,8 @@ struct ErrorMessage { src: String, error: String, debug: Option, - #[cause] cause: glib::Error, + #[cause] + cause: glib::Error, } const WIDTH: usize = 320; diff --git a/examples/src/bin/decodebin.rs b/examples/src/bin/decodebin.rs index 1966d3280..6a172b369 100644 --- a/examples/src/bin/decodebin.rs +++ b/examples/src/bin/decodebin.rs @@ -28,7 +28,8 @@ struct ErrorMessage { src: String, error: String, debug: Option, - #[cause] cause: glib::Error, + #[cause] + cause: glib::Error, } fn example_main() -> Result<(), Error> { diff --git a/examples/src/bin/rtpfecclient.rs b/examples/src/bin/rtpfecclient.rs index e49c4141d..9cf655e40 100644 --- a/examples/src/bin/rtpfecclient.rs +++ b/examples/src/bin/rtpfecclient.rs @@ -38,7 +38,8 @@ struct ErrorMessage { src: String, error: String, debug: Option, - #[cause] cause: glib::Error, + #[cause] + cause: glib::Error, } fn make_element<'a, P: Into>>( @@ -121,16 +122,7 @@ fn example_main() -> Result<(), Error> { let scale = make_element("videoscale", None)?; let filter = make_element("capsfilter", None)?; - pipeline.add_many(&[ - &src, - &netsim, - &rtpbin, - &depay, - &dec, - &conv, - &scale, - &filter, - ])?; + pipeline.add_many(&[&src, &netsim, &rtpbin, &depay, &dec, &conv, &scale, &filter])?; gst::Element::link_many(&[&depay, &dec, &conv, &scale, &filter])?; match args[1].as_str() { @@ -253,16 +245,14 @@ fn example_main() -> Result<(), Error> { match msg.view() { MessageView::Eos(..) => break, MessageView::Error(err) => { - return Err( - ErrorMessage { - src: msg.get_src() - .map(|s| s.get_path_string()) - .unwrap_or(String::from("None")), - error: err.get_error().description().into(), - debug: err.get_debug(), - cause: err.get_error(), - }.into(), - ); + return Err(ErrorMessage { + src: msg.get_src() + .map(|s| s.get_path_string()) + .unwrap_or(String::from("None")), + error: err.get_error().description().into(), + debug: err.get_debug(), + cause: err.get_error(), + }.into()); } MessageView::StateChanged(s) => match msg.get_src() { Some(element) => if element == pipeline && s.get_current() == gst::State::Playing { diff --git a/examples/src/bin/rtpfecserver.rs b/examples/src/bin/rtpfecserver.rs index ed46de7ed..4f4dd7ddb 100644 --- a/examples/src/bin/rtpfecserver.rs +++ b/examples/src/bin/rtpfecserver.rs @@ -35,7 +35,8 @@ struct ErrorMessage { src: String, error: String, debug: Option, - #[cause] cause: glib::Error, + #[cause] + cause: glib::Error, } fn make_element<'a, P: Into>>( @@ -183,16 +184,14 @@ fn example_main() -> Result<(), Error> { match msg.view() { MessageView::Eos(..) => break, MessageView::Error(err) => { - return Err( - ErrorMessage { - src: msg.get_src() - .map(|s| s.get_path_string()) - .unwrap_or(String::from("None")), - error: err.get_error().description().into(), - debug: err.get_debug(), - cause: err.get_error(), - }.into(), - ); + return Err(ErrorMessage { + src: msg.get_src() + .map(|s| s.get_path_string()) + .unwrap_or(String::from("None")), + error: err.get_error().description().into(), + debug: err.get_debug(), + cause: err.get_error(), + }.into()); } MessageView::StateChanged(s) => match msg.get_src() { Some(element) => if element == pipeline && s.get_current() == gst::State::Playing { diff --git a/examples/src/bin/rtsp-server.rs b/examples/src/bin/rtsp-server.rs index 6a40c6246..d133eb5ff 100644 --- a/examples/src/bin/rtsp-server.rs +++ b/examples/src/bin/rtsp-server.rs @@ -50,7 +50,10 @@ fn main_loop() -> Result<(), Error> { server.attach(None); - println!("Stream ready at rtsp://127.0.0.1:{}/test", server.get_bound_port()); + println!( + "Stream ready at rtsp://127.0.0.1:{}/test", + server.get_bound_port() + ); main_loop.run(); @@ -62,7 +65,9 @@ fn example_main() -> Result<(), Error> { #[cfg(not(feature = "gst-rtsp-server"))] { - eprintln!("Feature gst-rtsp-server is required. Please rebuild with --features gst-rtsp-server"); + eprintln!( + "Feature gst-rtsp-server is required. Please rebuild with --features gst-rtsp-server" + ); std::process::exit(-1) } diff --git a/examples/src/bin/tagsetter.rs b/examples/src/bin/tagsetter.rs index 71a6f55e3..91d0d725b 100644 --- a/examples/src/bin/tagsetter.rs +++ b/examples/src/bin/tagsetter.rs @@ -24,7 +24,8 @@ struct ErrorMessage { src: String, error: String, debug: Option, - #[cause] cause: glib::Error, + #[cause] + cause: glib::Error, } fn example_main() -> Result<(), Error> { diff --git a/gstreamer-audio/src/audio_info.rs b/gstreamer-audio/src/audio_info.rs index df0d5df48..9af9da232 100644 --- a/gstreamer-audio/src/audio_info.rs +++ b/gstreamer-audio/src/audio_info.rs @@ -298,8 +298,7 @@ impl glib::types::StaticType for AudioInfo { #[doc(hidden)] impl<'a> glib::value::FromValueOptional<'a> for AudioInfo { unsafe fn from_value_optional(value: &glib::Value) -> Option { - Option::::from_glib_none(gobject_ffi::g_value_get_boxed(value.to_glib_none().0) - as *mut ffi::GstAudioInfo) + Option::::from_glib_none(gobject_ffi::g_value_get_boxed(value.to_glib_none().0) as *mut ffi::GstAudioInfo) } } diff --git a/gstreamer-player/src/config.rs b/gstreamer-player/src/config.rs index 60a64c3d9..a71e59584 100644 --- a/gstreamer-player/src/config.rs +++ b/gstreamer-player/src/config.rs @@ -46,9 +46,7 @@ impl AsMut for PlayerConfig { impl PlayerConfig { pub fn get_position_update_interval(&self) -> u32 { assert_initialized_main_thread!(); - unsafe { - ffi::gst_player_config_get_position_update_interval(self.0.to_glib_none().0) - } + unsafe { ffi::gst_player_config_get_position_update_interval(self.0.to_glib_none().0) } } pub fn get_seek_accurate(&self) -> bool { diff --git a/gstreamer-rtsp-server/src/lib.rs b/gstreamer-rtsp-server/src/lib.rs index b54b00763..9497df88e 100644 --- a/gstreamer-rtsp-server/src/lib.rs +++ b/gstreamer-rtsp-server/src/lib.rs @@ -10,19 +10,19 @@ extern crate bitflags; extern crate libc; +extern crate gio; +extern crate gio_sys as gio_ffi; #[macro_use] extern crate glib; extern crate glib_sys as glib_ffi; -extern crate gio; -extern crate gio_sys as gio_ffi; extern crate gobject_sys as gobject_ffi; extern crate gstreamer as gst; -extern crate gstreamer_sys as gst_ffi; -extern crate gstreamer_rtsp as gst_rtsp; -extern crate gstreamer_rtsp_sys as gst_rtsp_ffi; extern crate gstreamer_net as gst_net; extern crate gstreamer_net_sys as gst_net_ffi; +extern crate gstreamer_rtsp as gst_rtsp; extern crate gstreamer_rtsp_server_sys as ffi; +extern crate gstreamer_rtsp_sys as gst_rtsp_ffi; +extern crate gstreamer_sys as gst_ffi; macro_rules! assert_initialized_main_thread { () => ( diff --git a/gstreamer-rtsp-server/src/r_t_s_p_address_pool.rs b/gstreamer-rtsp-server/src/r_t_s_p_address_pool.rs index a37389cc9..cb191ad11 100644 --- a/gstreamer-rtsp-server/src/r_t_s_p_address_pool.rs +++ b/gstreamer-rtsp-server/src/r_t_s_p_address_pool.rs @@ -7,17 +7,36 @@ use glib::translate::*; use std::ptr; pub trait RTSPAddressPoolExtManual { - fn reserve_address(&self, ip_address: &str, port: u32, n_ports: u32, ttl: u32) -> Result; + fn reserve_address( + &self, + ip_address: &str, + port: u32, + n_ports: u32, + ttl: u32, + ) -> Result; } impl> RTSPAddressPoolExtManual for O { - fn reserve_address(&self, ip_address: &str, port: u32, n_ports: u32, ttl: u32) -> Result { + fn reserve_address( + &self, + ip_address: &str, + port: u32, + n_ports: u32, + ttl: u32, + ) -> Result { unsafe { let mut address = ptr::null_mut(); - let ret = from_glib(ffi::gst_rtsp_address_pool_reserve_address(self.to_glib_none().0, ip_address.to_glib_none().0, port, n_ports, ttl, &mut address)); + let ret = from_glib(ffi::gst_rtsp_address_pool_reserve_address( + self.to_glib_none().0, + ip_address.to_glib_none().0, + port, + n_ports, + ttl, + &mut address, + )); match ret { RTSPAddressPoolResult::Ok => Ok(from_glib_full(address)), - _ => Err(ret) + _ => Err(ret), } } } diff --git a/gstreamer-rtsp-server/src/r_t_s_p_client.rs b/gstreamer-rtsp-server/src/r_t_s_p_client.rs index 9f5186491..d2b14403a 100644 --- a/gstreamer-rtsp-server/src/r_t_s_p_client.rs +++ b/gstreamer-rtsp-server/src/r_t_s_p_client.rs @@ -14,7 +14,10 @@ impl> RTSPClientExtManual for O { let context = context.into(); let context = context.to_glib_none(); unsafe { - from_glib(ffi::gst_rtsp_client_attach(self.to_glib_none().0, context.0)) + from_glib(ffi::gst_rtsp_client_attach( + self.to_glib_none().0, + context.0, + )) } } } diff --git a/gstreamer-rtsp-server/src/r_t_s_p_server.rs b/gstreamer-rtsp-server/src/r_t_s_p_server.rs index f813e7655..340eefe46 100644 --- a/gstreamer-rtsp-server/src/r_t_s_p_server.rs +++ b/gstreamer-rtsp-server/src/r_t_s_p_server.rs @@ -14,7 +14,10 @@ impl> RTSPServerExtManual for O { let context = context.into(); let context = context.to_glib_none(); unsafe { - from_glib(ffi::gst_rtsp_server_attach(self.to_glib_none().0, context.0)) + from_glib(ffi::gst_rtsp_server_attach( + self.to_glib_none().0, + context.0, + )) } } } diff --git a/gstreamer-rtsp-server/src/r_t_s_p_session_pool.rs b/gstreamer-rtsp-server/src/r_t_s_p_session_pool.rs index a1f73fa03..a146e98d2 100644 --- a/gstreamer-rtsp-server/src/r_t_s_p_session_pool.rs +++ b/gstreamer-rtsp-server/src/r_t_s_p_session_pool.rs @@ -50,7 +50,7 @@ impl> RTSPSessionPoolExtManual for O { func: F, ) -> glib::Source where - F: FnMut(&RTSPSessionPool) -> Continue + Send + 'static + F: FnMut(&RTSPSessionPool) -> Continue + Send + 'static, { skip_assert_initialized!(); unsafe { diff --git a/gstreamer-rtsp/src/lib.rs b/gstreamer-rtsp/src/lib.rs index 213618661..10834e75c 100644 --- a/gstreamer-rtsp/src/lib.rs +++ b/gstreamer-rtsp/src/lib.rs @@ -15,10 +15,10 @@ extern crate glib; extern crate glib_sys as glib_ffi; extern crate gobject_sys as gobject_ffi; extern crate gstreamer as gst; -extern crate gstreamer_sys as gst_ffi; +extern crate gstreamer_rtsp_sys as ffi; extern crate gstreamer_sdp as gst_sdp; extern crate gstreamer_sdp_sys as gst_sdp_ffi; -extern crate gstreamer_rtsp_sys as ffi; +extern crate gstreamer_sys as gst_ffi; macro_rules! assert_initialized_main_thread { () => ( diff --git a/gstreamer-sdp/src/lib.rs b/gstreamer-sdp/src/lib.rs index 002e62977..3242a0af3 100644 --- a/gstreamer-sdp/src/lib.rs +++ b/gstreamer-sdp/src/lib.rs @@ -13,8 +13,8 @@ extern crate glib; extern crate glib_sys as glib_ffi; extern crate gobject_sys as gobject_ffi; extern crate gstreamer as gst; -extern crate gstreamer_sys as gst_ffi; extern crate gstreamer_sdp_sys as ffi; +extern crate gstreamer_sys as gst_ffi; macro_rules! skip_assert_initialized { () => ( diff --git a/gstreamer-video/src/lib.rs b/gstreamer-video/src/lib.rs index f28317f5c..79f23aecd 100644 --- a/gstreamer-video/src/lib.rs +++ b/gstreamer-video/src/lib.rs @@ -16,8 +16,8 @@ extern crate glib_sys as glib_ffi; extern crate gobject_sys as gobject_ffi; extern crate gstreamer as gst; extern crate gstreamer_base as gst_base; -extern crate gstreamer_sys as gst_ffi; extern crate gstreamer_base_sys as gst_base_ffi; +extern crate gstreamer_sys as gst_ffi; extern crate gstreamer_video_sys as ffi; macro_rules! assert_initialized_main_thread { diff --git a/gstreamer-video/src/video_frame.rs b/gstreamer-video/src/video_frame.rs index 7056826ff..d3eccdcc2 100644 --- a/gstreamer-video/src/video_frame.rs +++ b/gstreamer-video/src/video_frame.rs @@ -395,7 +395,10 @@ impl<'a> VideoFrameRef<&'a gst::BufferRef> { self.0.id } - pub fn copy(&self, dest: &mut VideoFrameRef<&mut gst::BufferRef>) -> Result<(), glib::BoolError> { + pub fn copy( + &self, + dest: &mut VideoFrameRef<&mut gst::BufferRef>, + ) -> Result<(), glib::BoolError> { unsafe { let res: bool = from_glib(ffi::gst_video_frame_copy(&mut dest.0, &self.0)); if res { diff --git a/gstreamer-video/src/video_info.rs b/gstreamer-video/src/video_info.rs index 102a35d0c..7aaa48c5c 100644 --- a/gstreamer-video/src/video_info.rs +++ b/gstreamer-video/src/video_info.rs @@ -26,7 +26,8 @@ pub enum VideoColorRange { Unknown, Range0255, Range16235, - #[doc(hidden)] __Unknown(i32), + #[doc(hidden)] + __Unknown(i32), } #[doc(hidden)] @@ -205,7 +206,8 @@ pub struct VideoInfoBuilder<'a> { stride: Option<&'a [i32]>, multiview_mode: Option<::VideoMultiviewMode>, multiview_flags: Option<::VideoMultiviewFlags>, - #[cfg(any(feature = "v1_12", feature = "dox"))] field_order: Option<::VideoFieldOrder>, + #[cfg(any(feature = "v1_12", feature = "dox"))] + field_order: Option<::VideoFieldOrder>, } impl<'a> VideoInfoBuilder<'a> { @@ -636,8 +638,7 @@ impl glib::types::StaticType for VideoInfo { #[doc(hidden)] impl<'a> glib::value::FromValueOptional<'a> for VideoInfo { unsafe fn from_value_optional(value: &glib::Value) -> Option { - Option::::from_glib_none(gobject_ffi::g_value_get_boxed(value.to_glib_none().0) - as *mut ffi::GstVideoInfo) + Option::::from_glib_none(gobject_ffi::g_value_get_boxed(value.to_glib_none().0) as *mut ffi::GstVideoInfo) } } diff --git a/gstreamer/src/buffer.rs b/gstreamer/src/buffer.rs index 7e41bf8de..e3d43c3a5 100644 --- a/gstreamer/src/buffer.rs +++ b/gstreamer/src/buffer.rs @@ -157,9 +157,7 @@ impl GstRc { pub fn append(buffer: Self, other: Self) -> Self { skip_assert_initialized!(); - unsafe { - from_glib_full(ffi::gst_buffer_append(buffer.into_ptr(), other.into_ptr())) - } + unsafe { from_glib_full(ffi::gst_buffer_append(buffer.into_ptr(), other.into_ptr())) } } } @@ -172,9 +170,8 @@ impl Default for GstRc { impl BufferRef { pub fn map_readable(&self) -> Option> { let mut map_info: ffi::GstMapInfo = unsafe { mem::zeroed() }; - let res = unsafe { - ffi::gst_buffer_map(self.as_mut_ptr(), &mut map_info, ffi::GST_MAP_READ) - }; + let res = + unsafe { ffi::gst_buffer_map(self.as_mut_ptr(), &mut map_info, ffi::GST_MAP_READ) }; if res == glib_ffi::GTRUE { Some(BufferMap { buffer: self, @@ -385,10 +382,7 @@ impl ToOwned for BufferRef { type Owned = GstRc; fn to_owned(&self) -> GstRc { - unsafe { - from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) - as *mut _) - } + unsafe { from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) as *mut _) } } } @@ -440,9 +434,7 @@ impl<'a, T> BufferMap<'a, T> { impl<'a> BufferMap<'a, Writable> { pub fn as_mut_slice(&mut self) -> &mut [u8] { - unsafe { - slice::from_raw_parts_mut(self.map_info.data as *mut u8, self.map_info.size) - } + unsafe { slice::from_raw_parts_mut(self.map_info.data as *mut u8, self.map_info.size) } } } @@ -521,9 +513,7 @@ impl MappedBuffer { impl MappedBuffer { pub fn as_mut_slice(&mut self) -> &mut [u8] { - unsafe { - slice::from_raw_parts_mut(self.map_info.data as *mut u8, self.map_info.size) - } + unsafe { slice::from_raw_parts_mut(self.map_info.data as *mut u8, self.map_info.size) } } } diff --git a/gstreamer/src/bufferlist.rs b/gstreamer/src/bufferlist.rs index 17bf30099..252e84a34 100644 --- a/gstreamer/src/bufferlist.rs +++ b/gstreamer/src/bufferlist.rs @@ -88,10 +88,7 @@ impl ToOwned for BufferListRef { type Owned = GstRc; fn to_owned(&self) -> GstRc { - unsafe { - from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) - as *mut _) - } + unsafe { from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) as *mut _) } } } diff --git a/gstreamer/src/bus.rs b/gstreamer/src/bus.rs index 8ddaff8d8..2ce87c595 100644 --- a/gstreamer/src/bus.rs +++ b/gstreamer/src/bus.rs @@ -132,9 +132,7 @@ impl Bus { } pub fn unset_sync_handler(&self) { - unsafe { - ffi::gst_bus_set_sync_handler(self.to_glib_none().0, None, ptr::null_mut(), None) - } + unsafe { ffi::gst_bus_set_sync_handler(self.to_glib_none().0, None, ptr::null_mut(), None) } } } diff --git a/gstreamer/src/caps.rs b/gstreamer/src/caps.rs index 30c797481..e04da52ca 100644 --- a/gstreamer/src/caps.rs +++ b/gstreamer/src/caps.rs @@ -359,10 +359,7 @@ impl ToOwned for CapsRef { type Owned = GstRc; fn to_owned(&self) -> GstRc { - unsafe { - from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) - as *mut _) - } + unsafe { from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) as *mut _) } } } diff --git a/gstreamer/src/context.rs b/gstreamer/src/context.rs index ed1a0fe75..cc4501365 100644 --- a/gstreamer/src/context.rs +++ b/gstreamer/src/context.rs @@ -59,9 +59,7 @@ impl ContextRef { } pub fn get_structure(&self) -> &StructureRef { - unsafe { - StructureRef::from_glib_borrow(ffi::gst_context_get_structure(self.as_mut_ptr())) - } + unsafe { StructureRef::from_glib_borrow(ffi::gst_context_get_structure(self.as_mut_ptr())) } } pub fn get_mut_structure(&mut self) -> &mut StructureRef { @@ -92,10 +90,7 @@ impl ToOwned for ContextRef { type Owned = GstRc; fn to_owned(&self) -> GstRc { - unsafe { - from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) - as *mut _) - } + unsafe { from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) as *mut _) } } } diff --git a/gstreamer/src/event.rs b/gstreamer/src/event.rs index 5415c4f9c..ddaf66090 100644 --- a/gstreamer/src/event.rs +++ b/gstreamer/src/event.rs @@ -454,10 +454,7 @@ impl ToOwned for EventRef { type Owned = GstRc; fn to_owned(&self) -> GstRc { - unsafe { - from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) - as *mut _) - } + unsafe { from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) as *mut _) } } } @@ -884,30 +881,32 @@ impl<'a> EventBuilder<'a> { Self { seqnum: None, running_time_offset: None, - other_fields: Vec::new() + other_fields: Vec::new(), } } fn seqnum(self, seqnum: Seqnum) -> Self { Self { seqnum: Some(seqnum), - .. self + ..self } } fn running_time_offset(self, running_time_offset: i64) -> Self { Self { running_time_offset: Some(running_time_offset), - .. self + ..self } } fn other_fields(self, other_fields: &[(&'a str, &'a ToSendValue)]) -> Self { Self { - other_fields: self.other_fields.iter().cloned() + other_fields: self.other_fields + .iter() + .cloned() .chain(other_fields.iter().cloned()) .collect(), - .. self + ..self } } } @@ -1618,7 +1617,7 @@ mod tests { EventView::FlushStart(flush_start_evt) => { assert!(!flush_start_evt.is_sticky()); assert!(flush_start_evt.get_structure().is_none()); - }, + } _ => panic!("flush_start_evt.view() is not an EventView::FlushStart(_)"), } @@ -1631,7 +1630,7 @@ mod tests { if let Some(other_fields) = flush_start_evt.get_structure() { assert!(other_fields.has_field("extra-field")); } - }, + } _ => panic!("flush_start_evt.view() is not an EventView::FlushStart(_)"), } diff --git a/gstreamer/src/message.rs b/gstreamer/src/message.rs index c4fcd47c1..2429ef2dd 100644 --- a/gstreamer/src/message.rs +++ b/gstreamer/src/message.rs @@ -372,10 +372,7 @@ impl ToOwned for MessageRef { type Owned = GstRc; fn to_owned(&self) -> GstRc { - unsafe { - from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) - as *mut _) - } + unsafe { from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) as *mut _) } } } @@ -1171,7 +1168,7 @@ impl<'a> MessageBuilder<'a> { Self { src: None, seqnum: None, - other_fields: Vec::new() + other_fields: Vec::new(), } } @@ -1181,14 +1178,14 @@ impl<'a> MessageBuilder<'a> { let o = (*o).clone(); o.upcast::() }), - .. self + ..self } } fn seqnum(self, seqnum: Seqnum) -> Self { Self { seqnum: Some(seqnum), - .. self + ..self } } @@ -1284,7 +1281,8 @@ pub struct ErrorBuilder<'a, T> { error: T, message: &'a str, debug: Option<&'a str>, - #[allow(unused)] details: Option, + #[allow(unused)] + details: Option, } impl<'a, T: MessageErrorDomain> ErrorBuilder<'a, T> { fn new(error: T, message: &'a str) -> Self { @@ -1348,7 +1346,8 @@ pub struct WarningBuilder<'a, T> { error: T, message: &'a str, debug: Option<&'a str>, - #[allow(unused)] details: Option, + #[allow(unused)] + details: Option, } impl<'a, T: MessageErrorDomain> WarningBuilder<'a, T> { fn new(error: T, message: &'a str) -> Self { @@ -1412,7 +1411,8 @@ pub struct InfoBuilder<'a, T> { error: T, message: &'a str, debug: Option<&'a str>, - #[allow(unused)] details: Option, + #[allow(unused)] + details: Option, } impl<'a, T: MessageErrorDomain> InfoBuilder<'a, T> { fn new(error: T, message: &'a str) -> Self { @@ -2241,8 +2241,10 @@ impl<'a> StreamCollectionBuilder<'a> { #[cfg(any(feature = "v1_10", feature = "dox"))] pub struct StreamsSelectedBuilder<'a> { builder: MessageBuilder<'a>, - #[cfg(any(feature = "v1_10", feature = "dox"))] collection: &'a ::StreamCollection, - #[cfg(any(feature = "v1_10", feature = "dox"))] streams: Option<&'a [&'a ::Stream]>, + #[cfg(any(feature = "v1_10", feature = "dox"))] + collection: &'a ::StreamCollection, + #[cfg(any(feature = "v1_10", feature = "dox"))] + streams: Option<&'a [&'a ::Stream]>, } #[cfg(any(feature = "v1_10", feature = "dox"))] impl<'a> StreamsSelectedBuilder<'a> { @@ -2363,14 +2365,12 @@ mod tests { ::init().unwrap(); // Message without arguments - let eos_msg = Message::new_eos() - .seqnum(Seqnum(1)) - .build(); + let eos_msg = Message::new_eos().seqnum(Seqnum(1)).build(); match eos_msg.view() { MessageView::Eos(eos_msg) => { assert_eq!(eos_msg.get_seqnum(), Seqnum(1)); assert!(eos_msg.get_structure().is_none()); - }, + } _ => panic!("eos_msg.view() is not a MessageView::Eos(_)"), } diff --git a/gstreamer/src/miniobject.rs b/gstreamer/src/miniobject.rs index 9f1be2410..90954588e 100644 --- a/gstreamer/src/miniobject.rs +++ b/gstreamer/src/miniobject.rs @@ -66,9 +66,10 @@ impl GstRc { return &mut *self.obj; } - self.obj = T::from_mut_ptr(ffi::gst_mini_object_make_writable(self.as_mut_ptr() - as *mut ffi::GstMiniObject) - as *mut T::GstType); + self.obj = T::from_mut_ptr( + ffi::gst_mini_object_make_writable(self.as_mut_ptr() as *mut ffi::GstMiniObject) + as *mut T::GstType, + ); assert!(self.is_writable()); &mut *self.obj @@ -85,8 +86,7 @@ impl GstRc { pub fn is_writable(&self) -> bool { unsafe { - from_glib(ffi::gst_mini_object_is_writable(self.as_ptr() - as *const ffi::GstMiniObject)) + from_glib(ffi::gst_mini_object_is_writable(self.as_ptr() as *const ffi::GstMiniObject)) } } @@ -191,9 +191,10 @@ where fn copy(&self) -> GstRc { unsafe { - GstRc::from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() - as *const ffi::GstMiniObject) - as *const Self::GstType) + GstRc::from_glib_full( + ffi::gst_mini_object_copy(self.as_ptr() as *const ffi::GstMiniObject) + as *const Self::GstType, + ) } } } @@ -287,7 +288,8 @@ impl<'a, T: MiniObject + 'static> ToGlibContainerFromSlice<'a, *mut *mut T::GstT } impl<'a, T: MiniObject + 'static> ToGlibContainerFromSlice<'a, *const *mut T::GstType> - for GstRc { + for GstRc +{ #[cfg_attr(feature = "cargo-clippy", allow(type_complexity))] type Storage = ( Vec>>, @@ -351,7 +353,8 @@ impl FromGlibPtrBorrow<*mut T::GstType> for GstRc { } impl FromGlibContainerAsVec<*mut T::GstType, *mut *mut T::GstType> - for GstRc { + for GstRc +{ unsafe fn from_glib_none_num_as_vec(ptr: *mut *mut T::GstType, num: usize) -> Vec { if num == 0 || ptr.is_null() { return Vec::new(); @@ -385,7 +388,8 @@ impl FromGlibContainerAsVec<*mut T::GstType, *mut *mut } impl FromGlibPtrArrayContainerAsVec<*mut T::GstType, *mut *mut T::GstType> - for GstRc { + for GstRc +{ unsafe fn from_glib_none_as_vec(ptr: *mut *mut T::GstType) -> Vec { FromGlibContainerAsVec::from_glib_none_num_as_vec(ptr, c_ptr_array_len(ptr)) } @@ -400,7 +404,8 @@ impl FromGlibPtrArrayContainerAsVec<*mut T::GstType, *m } impl FromGlibContainerAsVec<*mut T::GstType, *const *mut T::GstType> - for GstRc { + for GstRc +{ unsafe fn from_glib_none_num_as_vec(ptr: *const *mut T::GstType, num: usize) -> Vec { FromGlibContainerAsVec::from_glib_none_num_as_vec(ptr as *mut *mut _, num) } @@ -418,7 +423,8 @@ impl FromGlibContainerAsVec<*mut T::GstType, *const *mu impl< T: MiniObject + 'static, -> FromGlibPtrArrayContainerAsVec<*mut T::GstType, *const *mut T::GstType> for GstRc { +> FromGlibPtrArrayContainerAsVec<*mut T::GstType, *const *mut T::GstType> for GstRc +{ unsafe fn from_glib_none_as_vec(ptr: *const *mut T::GstType) -> Vec { FromGlibPtrArrayContainerAsVec::from_glib_none_as_vec(ptr as *mut *mut _) } @@ -441,7 +447,8 @@ impl glib::StaticType for GstRc { } impl<'a, T: MiniObject + glib::StaticType + 'static> glib::value::FromValueOptional<'a> - for GstRc { + for GstRc +{ unsafe fn from_value_optional(v: &'a glib::Value) -> Option { let ptr = gobject_ffi::g_value_get_boxed(v.to_glib_none().0); from_glib_none(ptr as *const T::GstType) diff --git a/gstreamer/src/query.rs b/gstreamer/src/query.rs index 95304b867..65b43905a 100644 --- a/gstreamer/src/query.rs +++ b/gstreamer/src/query.rs @@ -35,120 +35,80 @@ unsafe impl MiniObject for QueryRef { impl GstRc { pub fn new_position(fmt: ::Format) -> Position { assert_initialized_main_thread!(); - unsafe { - Position::( - from_glib_full(ffi::gst_query_new_position(fmt.to_glib())) - ) - } + unsafe { Position::(from_glib_full(ffi::gst_query_new_position(fmt.to_glib()))) } } pub fn new_duration(fmt: ::Format) -> Duration { assert_initialized_main_thread!(); - unsafe { - Duration::( - from_glib_full(ffi::gst_query_new_duration(fmt.to_glib())) - ) - } + unsafe { Duration::(from_glib_full(ffi::gst_query_new_duration(fmt.to_glib()))) } } pub fn new_latency() -> Latency { assert_initialized_main_thread!(); - unsafe { - Latency::( - from_glib_full(ffi::gst_query_new_latency()) - ) - } + unsafe { Latency::(from_glib_full(ffi::gst_query_new_latency())) } } pub fn new_seeking(fmt: ::Format) -> Seeking { assert_initialized_main_thread!(); - unsafe { - Seeking::( - from_glib_full(ffi::gst_query_new_seeking(fmt.to_glib())) - ) - } + unsafe { Seeking::(from_glib_full(ffi::gst_query_new_seeking(fmt.to_glib()))) } } pub fn new_segment(fmt: ::Format) -> Segment { assert_initialized_main_thread!(); - unsafe { - Segment::( - from_glib_full(ffi::gst_query_new_segment(fmt.to_glib())) - ) - } + unsafe { Segment::(from_glib_full(ffi::gst_query_new_segment(fmt.to_glib()))) } } pub fn new_convert>( value: V, - dest_fmt: ::Format + dest_fmt: ::Format, ) -> Convert { assert_initialized_main_thread!(); let value = value.into(); unsafe { - Convert::( - from_glib_full(ffi::gst_query_new_convert( - value.get_format().to_glib(), - value.get_value(), - dest_fmt.to_glib(), - )) - ) + Convert::(from_glib_full(ffi::gst_query_new_convert( + value.get_format().to_glib(), + value.get_value(), + dest_fmt.to_glib(), + ))) } } pub fn new_formats() -> Formats { assert_initialized_main_thread!(); - unsafe { - Formats::( - from_glib_full(ffi::gst_query_new_formats()) - ) - } + unsafe { Formats::(from_glib_full(ffi::gst_query_new_formats())) } } pub fn new_buffering(fmt: ::Format) -> Buffering { assert_initialized_main_thread!(); - unsafe { - Buffering::( - from_glib_full(ffi::gst_query_new_buffering(fmt.to_glib())) - ) - } + unsafe { Buffering::(from_glib_full(ffi::gst_query_new_buffering(fmt.to_glib()))) } } pub fn new_custom(structure: ::Structure) -> Custom { assert_initialized_main_thread!(); unsafe { - Custom::( - from_glib_full(ffi::gst_query_new_custom( - ffi::GST_QUERY_CUSTOM, - structure.into_ptr(), - )) - ) + Custom::(from_glib_full(ffi::gst_query_new_custom( + ffi::GST_QUERY_CUSTOM, + structure.into_ptr(), + ))) } } pub fn new_uri() -> Uri { assert_initialized_main_thread!(); - unsafe { - Uri::( - from_glib_full(ffi::gst_query_new_uri()) - ) - } + unsafe { Uri::(from_glib_full(ffi::gst_query_new_uri())) } } pub fn new_scheduling() -> Scheduling { assert_initialized_main_thread!(); - unsafe { - Scheduling::( - from_glib_full(ffi::gst_query_new_scheduling()) - ) - } + unsafe { Scheduling::(from_glib_full(ffi::gst_query_new_scheduling())) } } pub fn new_accept_caps(caps: &::Caps) -> AcceptCaps { assert_initialized_main_thread!(); unsafe { - AcceptCaps::( - from_glib_full(ffi::gst_query_new_accept_caps(caps.as_mut_ptr())) - ) + AcceptCaps::(from_glib_full(ffi::gst_query_new_accept_caps( + caps.as_mut_ptr(), + ))) } } @@ -156,27 +116,23 @@ impl GstRc { assert_initialized_main_thread!(); let filter = filter.into(); unsafe { - Caps::( - from_glib_full(ffi::gst_query_new_caps(filter.to_glib_none().0)) - ) + Caps::(from_glib_full(ffi::gst_query_new_caps( + filter.to_glib_none().0, + ))) } } pub fn new_drain() -> Drain { assert_initialized_main_thread!(); - unsafe { - Drain::( - from_glib_full(ffi::gst_query_new_drain()) - ) - } + unsafe { Drain::(from_glib_full(ffi::gst_query_new_drain())) } } pub fn new_context(context_type: &str) -> Context { assert_initialized_main_thread!(); unsafe { - Context::( - from_glib_full(ffi::gst_query_new_context(context_type.to_glib_none().0)) - ) + Context::(from_glib_full(ffi::gst_query_new_context( + context_type.to_glib_none().0, + ))) } } } @@ -201,21 +157,15 @@ impl QueryRef { } pub fn is_downstream(&self) -> bool { - unsafe { - ((*self.as_ptr()).type_ as u32) & (ffi::GST_QUERY_TYPE_DOWNSTREAM.bits()) != 0 - } + unsafe { ((*self.as_ptr()).type_ as u32) & (ffi::GST_QUERY_TYPE_DOWNSTREAM.bits()) != 0 } } pub fn is_upstream(&self) -> bool { - unsafe { - ((*self.as_ptr()).type_ as u32) & (ffi::GST_QUERY_TYPE_UPSTREAM.bits()) != 0 - } + unsafe { ((*self.as_ptr()).type_ as u32) & (ffi::GST_QUERY_TYPE_UPSTREAM.bits()) != 0 } } pub fn is_serialized(&self) -> bool { - unsafe { - ((*self.as_ptr()).type_ as u32) & (ffi::GST_QUERY_TYPE_SERIALIZED.bits()) != 0 - } + unsafe { ((*self.as_ptr()).type_ as u32) & (ffi::GST_QUERY_TYPE_SERIALIZED.bits()) != 0 } } pub fn view(&self) -> QueryView<&Self> { @@ -1128,7 +1078,9 @@ mod tests { QueryView::Position(ref p) => { let pos = p.get_result(); assert_eq!(pos.try_into_time(), Ok(3 * ::SECOND)); - unsafe { assert!(!p.as_mut_ptr().is_null()); } + unsafe { + assert!(!p.as_mut_ptr().is_null()); + } } _ => panic!("Wrong concrete Query in Query"), } @@ -1168,7 +1120,7 @@ mod tests { match query.view_mut() { QueryView::Duration(ref mut d) => { d.set(2 * ::SECOND); - }, + } _ => (), } @@ -1176,7 +1128,7 @@ mod tests { QueryView::Duration(ref d) => { let duration = d.get_result(); assert_eq!(duration.try_into_time(), Ok(2 * ::SECOND)); - }, + } _ => (), } } @@ -1186,6 +1138,8 @@ mod tests { ::init().unwrap(); let p = Query::new_position(::Format::Time); - unsafe { assert!(!p.as_mut_ptr().is_null()); } + unsafe { + assert!(!p.as_mut_ptr().is_null()); + } } } diff --git a/gstreamer/src/sample.rs b/gstreamer/src/sample.rs index 82dc8a739..de8352b7f 100644 --- a/gstreamer/src/sample.rs +++ b/gstreamer/src/sample.rs @@ -110,10 +110,7 @@ impl ToOwned for SampleRef { type Owned = GstRc; fn to_owned(&self) -> GstRc { - unsafe { - from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) - as *mut _) - } + unsafe { from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) as *mut _) } } } diff --git a/gstreamer/src/segment.rs b/gstreamer/src/segment.rs index 7d0494e65..de6d728b1 100644 --- a/gstreamer/src/segment.rs +++ b/gstreamer/src/segment.rs @@ -567,8 +567,7 @@ impl glib::types::StaticType for FormattedSegment { #[doc(hidden)] impl<'a> glib::value::FromValueOptional<'a> for Segment { unsafe fn from_value_optional(value: &glib::Value) -> Option { - Option::::from_glib_none(gobject_ffi::g_value_get_boxed(value.to_glib_none().0) - as *mut ffi::GstSegment) + Option::::from_glib_none(gobject_ffi::g_value_get_boxed(value.to_glib_none().0) as *mut ffi::GstSegment) } } @@ -601,7 +600,8 @@ impl glib::translate::GlibPtrDefault for FormattedSegment #[doc(hidden)] impl<'a, T: FormattedValue> glib::translate::ToGlibPtr<'a, *const ffi::GstSegment> - for FormattedSegment { + for FormattedSegment +{ type Storage = &'a FormattedSegment; fn to_glib_none(&'a self) -> glib::translate::Stash<'a, *const ffi::GstSegment, Self> { @@ -615,7 +615,8 @@ impl<'a, T: FormattedValue> glib::translate::ToGlibPtr<'a, *const ffi::GstSegmen #[doc(hidden)] impl<'a, T: FormattedValue> glib::translate::ToGlibPtrMut<'a, *mut ffi::GstSegment> - for FormattedSegment { + for FormattedSegment +{ type Storage = &'a mut FormattedSegment; #[inline] diff --git a/gstreamer/src/static_caps.rs b/gstreamer/src/static_caps.rs index 91cb825d4..a234bd055 100644 --- a/gstreamer/src/static_caps.rs +++ b/gstreamer/src/static_caps.rs @@ -36,8 +36,7 @@ impl glib::types::StaticType for StaticCaps { #[doc(hidden)] impl<'a> glib::value::FromValueOptional<'a> for StaticCaps { unsafe fn from_value_optional(value: &glib::Value) -> Option { - Option::::from_glib_none(gobject_ffi::g_value_get_boxed(value.to_glib_none().0) - as *mut ffi::GstStaticCaps) + Option::::from_glib_none(gobject_ffi::g_value_get_boxed(value.to_glib_none().0) as *mut ffi::GstStaticCaps) } } diff --git a/gstreamer/src/structure.rs b/gstreamer/src/structure.rs index f43cb1f9c..8af37b0e5 100644 --- a/gstreamer/src/structure.rs +++ b/gstreamer/src/structure.rs @@ -37,9 +37,7 @@ impl Structure { pub fn new_empty(name: &str) -> Structure { assert_initialized_main_thread!(); Structure( - unsafe { - ffi::gst_structure_new_empty(name.to_glib_none().0) as *mut StructureRef - }, + unsafe { ffi::gst_structure_new_empty(name.to_glib_none().0) as *mut StructureRef }, PhantomData, ) } diff --git a/gstreamer/src/tags.rs b/gstreamer/src/tags.rs index a7bc0acb3..d6c61aab0 100644 --- a/gstreamer/src/tags.rs +++ b/gstreamer/src/tags.rs @@ -306,9 +306,7 @@ impl TagListRef { } pub fn get_size<'a, T: Tag<'a>>(&'a self) -> u32 { - unsafe { - ffi::gst_tag_list_get_tag_size(self.as_ptr(), T::tag_name().to_glib_none().0) - } + unsafe { ffi::gst_tag_list_get_tag_size(self.as_ptr(), T::tag_name().to_glib_none().0) } } pub fn iter_tag<'a, T: Tag<'a>>(&'a self) -> TagIterator<'a, T> { @@ -320,9 +318,7 @@ impl TagListRef { } pub fn insert(&mut self, other: &TagListRef, mode: TagMergeMode) { - unsafe { - ffi::gst_tag_list_insert(self.as_mut_ptr(), other.as_ptr(), mode.to_glib()) - } + unsafe { ffi::gst_tag_list_insert(self.as_mut_ptr(), other.as_ptr(), mode.to_glib()) } } pub fn merge(&self, other: &TagListRef, mode: TagMergeMode) -> TagList { @@ -360,10 +356,7 @@ impl ToOwned for TagListRef { type Owned = GstRc; fn to_owned(&self) -> GstRc { - unsafe { - from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) - as *mut _) - } + unsafe { from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) as *mut _) } } } diff --git a/gstreamer/src/toc.rs b/gstreamer/src/toc.rs index 844e645c4..65103daf0 100644 --- a/gstreamer/src/toc.rs +++ b/gstreamer/src/toc.rs @@ -43,15 +43,11 @@ impl TocRef { } pub fn find_entry(&self, uid: &str) -> Option { - unsafe { - from_glib_none(ffi::gst_toc_find_entry(self.as_ptr(), uid.to_glib_none().0)) - } + unsafe { from_glib_none(ffi::gst_toc_find_entry(self.as_ptr(), uid.to_glib_none().0)) } } pub fn get_entries(&self) -> Vec { - unsafe { - FromGlibPtrContainer::from_glib_none(ffi::gst_toc_get_entries(self.as_ptr())) - } + unsafe { FromGlibPtrContainer::from_glib_none(ffi::gst_toc_get_entries(self.as_ptr())) } } pub fn append_entry(&mut self, entry: TocEntry) { @@ -93,10 +89,7 @@ impl ToOwned for TocRef { type Owned = GstRc; fn to_owned(&self) -> GstRc { - unsafe { - from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) - as *mut _) - } + unsafe { from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) as *mut _) } } } @@ -241,10 +234,7 @@ impl ToOwned for TocEntryRef { type Owned = GstRc; fn to_owned(&self) -> GstRc { - unsafe { - from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) - as *mut _) - } + unsafe { from_glib_full(ffi::gst_mini_object_copy(self.as_ptr() as *const _) as *mut _) } } } diff --git a/tutorials/src/bin/basic-tutorial-3.rs b/tutorials/src/bin/basic-tutorial-3.rs index d36efba98..84160690e 100644 --- a/tutorials/src/bin/basic-tutorial-3.rs +++ b/tutorials/src/bin/basic-tutorial-3.rs @@ -100,7 +100,11 @@ fn tutorial_main() { break; } MessageView::StateChanged(state_changed) => { - if state_changed.get_src().map(|s| s == pipeline).unwrap_or(false) { + if state_changed + .get_src() + .map(|s| s == pipeline) + .unwrap_or(false) + { println!( "Pipeline state changed from {:?} to {:?}", state_changed.get_old(), diff --git a/tutorials/src/bin/basic-tutorial-4.rs b/tutorials/src/bin/basic-tutorial-4.rs index 6a5f35492..0d96517c0 100644 --- a/tutorials/src/bin/basic-tutorial-4.rs +++ b/tutorials/src/bin/basic-tutorial-4.rs @@ -114,7 +114,8 @@ fn handle_message(custom_data: &mut CustomData, msg: &gst::GstRc if state_changed.get_src() + MessageView::StateChanged(state_changed) => if state_changed + .get_src() .map(|s| s == custom_data.playbin) .unwrap_or(false) { diff --git a/tutorials/src/bin/basic-tutorial-5.rs b/tutorials/src/bin/basic-tutorial-5.rs index 1df2a3804..496507085 100644 --- a/tutorials/src/bin/basic-tutorial-5.rs +++ b/tutorials/src/bin/basic-tutorial-5.rs @@ -347,7 +347,11 @@ mod tutorial5 { // This is called when the pipeline changes states. We use it to // keep track of the current state. gst::MessageView::StateChanged(state_changed) => { - if state_changed.get_src().map(|s| s == pipeline).unwrap_or(false) { + if state_changed + .get_src() + .map(|s| s == pipeline) + .unwrap_or(false) + { println!("State set to {:?}", state_changed.get_current()); } }