From 451c198cec203c2db78937c4686c7e1f88fb7a91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 30 Apr 2020 11:01:25 +0300 Subject: [PATCH] Run everything through cargo fmt again --- gstreamer-video/src/video_event.rs | 15 +++++++++------ gstreamer/src/event.rs | 10 +++++----- gstreamer/src/message.rs | 8 ++++---- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/gstreamer-video/src/video_event.rs b/gstreamer-video/src/video_event.rs index 135fd9a89..f5b43818c 100644 --- a/gstreamer-video/src/video_event.rs +++ b/gstreamer-video/src/video_event.rs @@ -29,23 +29,26 @@ macro_rules! event_builder_generic_impl { pub fn seqnum(self, seqnum: gst::Seqnum) -> Self { Self { seqnum: Some(seqnum), - .. self + ..self } } pub fn running_time_offset(self, running_time_offset: i64) -> Self { Self { running_time_offset: Some(running_time_offset), - .. self + ..self } } pub fn other_fields(self, other_fields: &[(&'a str, &'a dyn 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 } } @@ -63,7 +66,7 @@ macro_rules! event_builder_generic_impl { { let s = gst::StructureRef::from_glib_borrow_mut( - gst_sys::gst_event_writable_structure(event) + gst_sys::gst_event_writable_structure(event), ); for (k, v) in self.other_fields { @@ -74,7 +77,7 @@ macro_rules! event_builder_generic_impl { from_glib_full(event) } } - } + }; } pub fn new_downstream_force_key_unit_event<'a>() -> DownstreamForceKeyUnitEventBuilder<'a> { diff --git a/gstreamer/src/event.rs b/gstreamer/src/event.rs index b487ca8a2..6f913c158 100644 --- a/gstreamer/src/event.rs +++ b/gstreamer/src/event.rs @@ -975,7 +975,7 @@ macro_rules! event_builder_generic_impl { pub fn seqnum(self, seqnum: Seqnum) -> Self { Self { builder: self.builder.seqnum(seqnum), - .. self + ..self } } @@ -983,7 +983,7 @@ macro_rules! event_builder_generic_impl { pub fn running_time_offset(self, running_time_offset: i64) -> Self { Self { builder: self.builder.running_time_offset(running_time_offset), - .. self + ..self } } @@ -991,7 +991,7 @@ macro_rules! event_builder_generic_impl { pub fn other_fields(self, other_fields: &[(&'a str, &'a dyn ToSendValue)]) -> Self { Self { builder: self.builder.other_fields(other_fields), - .. self + ..self } } @@ -1009,7 +1009,7 @@ macro_rules! event_builder_generic_impl { if !self.builder.other_fields.is_empty() { let s = StructureRef::from_glib_borrow_mut( - gst_sys::gst_event_writable_structure(event) + gst_sys::gst_event_writable_structure(event), ); for (k, v) in self.builder.other_fields { @@ -1020,7 +1020,7 @@ macro_rules! event_builder_generic_impl { from_glib_full(event) } } - } + }; } pub struct FlushStartBuilder<'a> { diff --git a/gstreamer/src/message.rs b/gstreamer/src/message.rs index 4085d31cc..938c40381 100644 --- a/gstreamer/src/message.rs +++ b/gstreamer/src/message.rs @@ -1281,7 +1281,7 @@ macro_rules! message_builder_generic_impl { pub fn src + Cast + Clone>(self, src: Option<&O>) -> Self { Self { builder: self.builder.src(src), - .. self + ..self } } @@ -1289,7 +1289,7 @@ macro_rules! message_builder_generic_impl { pub fn seqnum(self, seqnum: Seqnum) -> Self { Self { builder: self.builder.seqnum(seqnum), - .. self + ..self } } @@ -1298,7 +1298,7 @@ macro_rules! message_builder_generic_impl { pub fn other_fields(self, other_fields: &[(&'a str, &'a dyn ToSendValue)]) -> Self { Self { builder: self.builder.other_fields(other_fields), - .. self + ..self } } @@ -1329,7 +1329,7 @@ macro_rules! message_builder_generic_impl { from_glib_full(msg) } } - } + }; } pub struct EosBuilder<'a> {