From 7eb8429046df00be47d1932d1ac48a9b4a97838a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 15 Nov 2017 22:33:51 +0200 Subject: [PATCH] Run everything through latest rustfmt-nightly again --- gstreamer-video/src/video_info.rs | 3 +-- gstreamer/src/message.rs | 6 ++---- gstreamer/src/structure.rs | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/gstreamer-video/src/video_info.rs b/gstreamer-video/src/video_info.rs index abd52b50b..5c640b1da 100644 --- a/gstreamer-video/src/video_info.rs +++ b/gstreamer-video/src/video_info.rs @@ -182,8 +182,7 @@ 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> { diff --git a/gstreamer/src/message.rs b/gstreamer/src/message.rs index 1f4b52062..e1fbd2067 100644 --- a/gstreamer/src/message.rs +++ b/gstreamer/src/message.rs @@ -2278,10 +2278,8 @@ pub struct StreamsSelectedBuilder<'a> { src: Option, seqnum: Option, other_fields: Vec<(&'a str, &'a ToSendValue)>, - #[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> { diff --git a/gstreamer/src/structure.rs b/gstreamer/src/structure.rs index 2b90417a0..f9a95f3a6 100644 --- a/gstreamer/src/structure.rs +++ b/gstreamer/src/structure.rs @@ -20,13 +20,13 @@ use Fraction; use glib; use glib::translate::{from_glib, from_glib_full, from_glib_none, FromGlibPtrFull, FromGlibPtrNone, GlibPtrDefault, Stash, StashMut, ToGlib, ToGlibPtr, ToGlibPtrMut}; -use glib::value::{FromValueOptional, ToSendValue, SendValue}; +use glib::value::{FromValueOptional, SendValue, ToSendValue}; use ffi; use glib_ffi::gpointer; use gobject_ffi; pub struct Structure(*mut StructureRef, PhantomData); -unsafe impl Send for Structure { } +unsafe impl Send for Structure {} impl Structure { pub fn builder(name: &str) -> Builder {