From 2cefd9aea6968143198b2c899e0f3d66884abdcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 25 Apr 2018 11:10:06 +0300 Subject: [PATCH] Re-run everything through rustfmt --- gstreamer-app/src/app_sink.rs | 4 ++-- gstreamer-app/src/app_src.rs | 4 ++-- gstreamer-audio/src/audio_channel_position.rs | 2 +- gstreamer-audio/src/audio_info.rs | 6 +++--- gstreamer-audio/src/audio_stream_align.rs | 2 +- gstreamer-base/src/adapter.rs | 2 +- gstreamer-base/src/base_sink.rs | 4 ++-- gstreamer-base/src/base_src.rs | 4 ++-- gstreamer-base/src/base_transform.rs | 4 ++-- gstreamer-base/src/functions.rs | 5 +---- gstreamer-net/src/net_client_clock.rs | 2 +- gstreamer-net/src/ntp_clock.rs | 2 +- gstreamer-net/src/ptp_clock.rs | 2 +- gstreamer-pbutils/src/discoverer.rs | 8 ++++---- gstreamer-player/src/player.rs | 8 ++++---- .../player_g_main_context_signal_dispatcher.rs | 2 +- gstreamer-player/src/player_video_info.rs | 2 +- .../src/player_video_overlay_video_renderer.rs | 4 ++-- gstreamer-rtsp-server/src/rtsp_address_pool.rs | 6 +++--- gstreamer-rtsp-server/src/rtsp_auth.rs | 4 ++-- gstreamer-rtsp-server/src/rtsp_client.rs | 2 +- gstreamer-rtsp-server/src/rtsp_server.rs | 2 +- gstreamer-rtsp-server/src/rtsp_session_pool.rs | 2 +- gstreamer-rtsp-server/src/rtsp_token.rs | 2 +- gstreamer-video/src/video_event.rs | 2 +- gstreamer-video/src/video_overlay.rs | 2 +- .../src/web_rtc_session_description.rs | 4 ++-- gstreamer/src/bin.rs | 2 +- gstreamer/src/buffer.rs | 2 +- gstreamer/src/buffer_pool.rs | 2 +- gstreamer/src/bufferlist.rs | 4 ++-- gstreamer/src/caps.rs | 2 +- gstreamer/src/child_proxy.rs | 2 +- gstreamer/src/clock.rs | 10 +++++----- gstreamer/src/context.rs | 4 ++-- gstreamer/src/date_time.rs | 2 +- gstreamer/src/device_provider.rs | 2 +- gstreamer/src/element.rs | 18 +++++++++--------- gstreamer/src/enums.rs | 6 +++--- gstreamer/src/event.rs | 2 +- gstreamer/src/format.rs | 4 ++-- gstreamer/src/ghost_pad.rs | 8 ++++---- gstreamer/src/gobject.rs | 2 +- gstreamer/src/iterator.rs | 4 ++-- gstreamer/src/lib.rs | 2 +- gstreamer/src/log.rs | 2 +- gstreamer/src/message.rs | 10 +++++----- gstreamer/src/object.rs | 2 +- gstreamer/src/pad.rs | 4 ++-- gstreamer/src/pad_template.rs | 4 ++-- gstreamer/src/plugin.rs | 2 +- gstreamer/src/promise.rs | 6 +++--- gstreamer/src/proxy_pad.rs | 4 ++-- gstreamer/src/query.rs | 2 +- gstreamer/src/sample.rs | 4 ++-- gstreamer/src/segment.rs | 10 +++++----- gstreamer/src/tag_setter.rs | 4 ++-- gstreamer/src/tags.rs | 2 +- gstreamer/src/toc.rs | 2 +- gstreamer/src/typefind.rs | 2 +- tutorials/src/bin/basic-tutorial-4.rs | 2 +- tutorials/src/bin/basic-tutorial-6.rs | 2 +- 62 files changed, 116 insertions(+), 119 deletions(-) diff --git a/gstreamer-app/src/app_sink.rs b/gstreamer-app/src/app_sink.rs index 8e82690ad..4ab416918 100644 --- a/gstreamer-app/src/app_sink.rs +++ b/gstreamer-app/src/app_sink.rs @@ -6,15 +6,15 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use AppSink; use ffi; use glib::source::CallbackGuard; use glib::translate::*; use glib_ffi::gpointer; use gst; use gst_ffi; -use std::ptr; use std::cell::RefCell; +use std::ptr; +use AppSink; pub struct AppSinkCallbacks { eos: Option>>, diff --git a/gstreamer-app/src/app_src.rs b/gstreamer-app/src/app_src.rs index 9a808172b..97bd237a5 100644 --- a/gstreamer-app/src/app_src.rs +++ b/gstreamer-app/src/app_src.rs @@ -6,15 +6,15 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use AppSrc; use ffi; use glib::source::CallbackGuard; use glib::translate::*; use glib_ffi::{gboolean, gpointer}; use gst; +use std::cell::RefCell; use std::mem; use std::ptr; -use std::cell::RefCell; +use AppSrc; pub struct AppSrcCallbacks { need_data: Option>>, diff --git a/gstreamer-audio/src/audio_channel_position.rs b/gstreamer-audio/src/audio_channel_position.rs index 5c05a7424..ceaec1369 100644 --- a/gstreamer-audio/src/audio_channel_position.rs +++ b/gstreamer-audio/src/audio_channel_position.rs @@ -6,8 +6,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use AudioChannelPosition; use ffi; +use AudioChannelPosition; use std::mem; diff --git a/gstreamer-audio/src/audio_info.rs b/gstreamer-audio/src/audio_info.rs index 6b3224532..5d1d98611 100644 --- a/gstreamer-audio/src/audio_info.rs +++ b/gstreamer-audio/src/audio_info.rs @@ -389,7 +389,7 @@ mod tests { &info.positions().unwrap(), &[ ::AudioChannelPosition::FrontLeft, - ::AudioChannelPosition::FrontRight + ::AudioChannelPosition::FrontRight, ] ); @@ -408,7 +408,7 @@ mod tests { &info.positions().unwrap(), &[ ::AudioChannelPosition::RearLeft, - ::AudioChannelPosition::RearRight + ::AudioChannelPosition::RearRight, ] ); } @@ -435,7 +435,7 @@ mod tests { &info.positions().unwrap(), &[ ::AudioChannelPosition::FrontLeft, - ::AudioChannelPosition::FrontRight + ::AudioChannelPosition::FrontRight, ] ); diff --git a/gstreamer-audio/src/audio_stream_align.rs b/gstreamer-audio/src/audio_stream_align.rs index 42ee4fead..fed017acc 100644 --- a/gstreamer-audio/src/audio_stream_align.rs +++ b/gstreamer-audio/src/audio_stream_align.rs @@ -6,8 +6,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use AudioStreamAlign; use ffi; +use AudioStreamAlign; use glib::translate::*; use gst; diff --git a/gstreamer-base/src/adapter.rs b/gstreamer-base/src/adapter.rs index 47e5d88a1..6e450bfd2 100644 --- a/gstreamer-base/src/adapter.rs +++ b/gstreamer-base/src/adapter.rs @@ -6,11 +6,11 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use Adapter; use ffi; use glib::translate::*; use gst; use std::io; +use Adapter; impl Adapter { pub fn copy(&self, offset: usize, dest: &mut [u8]) { diff --git a/gstreamer-base/src/base_sink.rs b/gstreamer-base/src/base_sink.rs index 07863445a..bfbef3c2d 100644 --- a/gstreamer-base/src/base_sink.rs +++ b/gstreamer-base/src/base_sink.rs @@ -6,11 +6,11 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use BaseSink; use ffi; -use glib::IsA; use glib::translate::*; +use glib::IsA; use gst; +use BaseSink; pub trait BaseSinkExtManual { fn get_segment(&self) -> gst::Segment; diff --git a/gstreamer-base/src/base_src.rs b/gstreamer-base/src/base_src.rs index 462eaedec..35ae4de43 100644 --- a/gstreamer-base/src/base_src.rs +++ b/gstreamer-base/src/base_src.rs @@ -6,11 +6,11 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use BaseSrc; use ffi; -use glib::IsA; use glib::translate::*; +use glib::IsA; use gst; +use BaseSrc; pub trait BaseSrcExtManual { fn get_segment(&self) -> gst::Segment; diff --git a/gstreamer-base/src/base_transform.rs b/gstreamer-base/src/base_transform.rs index 6d08de1b7..04fb6e0dc 100644 --- a/gstreamer-base/src/base_transform.rs +++ b/gstreamer-base/src/base_transform.rs @@ -6,11 +6,11 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use BaseTransform; use ffi; -use glib::IsA; use glib::translate::*; +use glib::IsA; use gst; +use BaseTransform; pub trait BaseTransformExtManual { fn get_segment(&self) -> gst::Segment; diff --git a/gstreamer-base/src/functions.rs b/gstreamer-base/src/functions.rs index 600a7882c..f0a406150 100644 --- a/gstreamer-base/src/functions.rs +++ b/gstreamer-base/src/functions.rs @@ -29,10 +29,7 @@ pub fn type_find_helper_for_data< let data = data.as_ref(); let (ptr, len) = (data.as_ptr(), data.len()); let ret = from_glib_full(ffi::gst_type_find_helper_for_data( - obj.0, - ptr, - len, - &mut prob, + obj.0, ptr, len, &mut prob, )); (ret, from_glib(prob)) } diff --git a/gstreamer-net/src/net_client_clock.rs b/gstreamer-net/src/net_client_clock.rs index fbe9d6b26..4b73525db 100644 --- a/gstreamer-net/src/net_client_clock.rs +++ b/gstreamer-net/src/net_client_clock.rs @@ -6,8 +6,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use NetClientClock; use ffi; +use NetClientClock; use glib::object::Downcast; use glib::translate::*; diff --git a/gstreamer-net/src/ntp_clock.rs b/gstreamer-net/src/ntp_clock.rs index 0a225e551..1f9d81787 100644 --- a/gstreamer-net/src/ntp_clock.rs +++ b/gstreamer-net/src/ntp_clock.rs @@ -6,8 +6,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use NtpClock; use ffi; +use NtpClock; use glib::object::Downcast; use glib::translate::*; diff --git a/gstreamer-net/src/ptp_clock.rs b/gstreamer-net/src/ptp_clock.rs index 390db0980..d6c10b435 100644 --- a/gstreamer-net/src/ptp_clock.rs +++ b/gstreamer-net/src/ptp_clock.rs @@ -6,8 +6,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use PtpClock; use ffi; +use PtpClock; use glib::object::Downcast; use glib::translate::*; diff --git a/gstreamer-pbutils/src/discoverer.rs b/gstreamer-pbutils/src/discoverer.rs index 9132d936f..b98e41294 100644 --- a/gstreamer-pbutils/src/discoverer.rs +++ b/gstreamer-pbutils/src/discoverer.rs @@ -11,12 +11,12 @@ use gst; use auto::Discoverer; +use glib::object::Downcast; +use glib::signal::connect; +use glib::signal::SignalHandlerId; +use glib::translate::*; use glib::IsA; use glib::Value; -use glib::object::Downcast; -use glib::signal::SignalHandlerId; -use glib::signal::connect; -use glib::translate::*; use ffi; use glib_ffi; diff --git a/gstreamer-player/src/player.rs b/gstreamer-player/src/player.rs index eeb75bed7..e32d071e8 100644 --- a/gstreamer-player/src/player.rs +++ b/gstreamer-player/src/player.rs @@ -6,18 +6,18 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use Player; -use PlayerSignalDispatcher; -use PlayerVideoRenderer; use ffi; use glib; -use glib::signal::SignalHandlerId; use glib::signal::connect; +use glib::signal::SignalHandlerId; use glib::translate::*; use glib_ffi; use gst; use std::boxed::Box as Box_; use std::mem::transmute; +use Player; +use PlayerSignalDispatcher; +use PlayerVideoRenderer; impl Player { pub fn new( diff --git a/gstreamer-player/src/player_g_main_context_signal_dispatcher.rs b/gstreamer-player/src/player_g_main_context_signal_dispatcher.rs index 48e87339f..2ea9cd917 100644 --- a/gstreamer-player/src/player_g_main_context_signal_dispatcher.rs +++ b/gstreamer-player/src/player_g_main_context_signal_dispatcher.rs @@ -6,10 +6,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use PlayerGMainContextSignalDispatcher; use ffi; use glib; use glib::translate::*; +use PlayerGMainContextSignalDispatcher; impl PlayerGMainContextSignalDispatcher { pub fn new<'a, P: Into>>( diff --git a/gstreamer-player/src/player_video_info.rs b/gstreamer-player/src/player_video_info.rs index 0111fb81b..b5eeddd40 100644 --- a/gstreamer-player/src/player_video_info.rs +++ b/gstreamer-player/src/player_video_info.rs @@ -6,11 +6,11 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use PlayerVideoInfo; use ffi; use glib::translate::*; use gst; use std::mem; +use PlayerVideoInfo; impl PlayerVideoInfo { pub fn get_framerate(&self) -> gst::Fraction { diff --git a/gstreamer-player/src/player_video_overlay_video_renderer.rs b/gstreamer-player/src/player_video_overlay_video_renderer.rs index 91de8cf78..59c195df9 100644 --- a/gstreamer-player/src/player_video_overlay_video_renderer.rs +++ b/gstreamer-player/src/player_video_overlay_video_renderer.rs @@ -6,11 +6,11 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use PlayerVideoOverlayVideoRenderer; use ffi; -use glib::IsA; use glib::translate::*; +use glib::IsA; use gst; +use PlayerVideoOverlayVideoRenderer; use std::ptr; diff --git a/gstreamer-rtsp-server/src/rtsp_address_pool.rs b/gstreamer-rtsp-server/src/rtsp_address_pool.rs index cb191ad11..1ef19f8f5 100644 --- a/gstreamer-rtsp-server/src/rtsp_address_pool.rs +++ b/gstreamer-rtsp-server/src/rtsp_address_pool.rs @@ -1,10 +1,10 @@ -use RTSPAddress; -use RTSPAddressPool; -use RTSPAddressPoolResult; use ffi; use glib::object::IsA; use glib::translate::*; use std::ptr; +use RTSPAddress; +use RTSPAddressPool; +use RTSPAddressPoolResult; pub trait RTSPAddressPoolExtManual { fn reserve_address( diff --git a/gstreamer-rtsp-server/src/rtsp_auth.rs b/gstreamer-rtsp-server/src/rtsp_auth.rs index e49b13f14..a8907b4ba 100644 --- a/gstreamer-rtsp-server/src/rtsp_auth.rs +++ b/gstreamer-rtsp-server/src/rtsp_auth.rs @@ -1,8 +1,8 @@ -use RTSPAuth; -use RTSPToken; use ffi; use glib::object::IsA; use glib::translate::*; +use RTSPAuth; +use RTSPToken; pub trait RTSPAuthExtManual { fn set_default_token<'a, P: Into>>(&self, token: P); diff --git a/gstreamer-rtsp-server/src/rtsp_client.rs b/gstreamer-rtsp-server/src/rtsp_client.rs index 8a3b8ffd8..3fe29dee3 100644 --- a/gstreamer-rtsp-server/src/rtsp_client.rs +++ b/gstreamer-rtsp-server/src/rtsp_client.rs @@ -1,9 +1,9 @@ -use RTSPClient; use ffi; use glib; use glib::object::IsA; use glib::source::SourceId; use glib::translate::*; +use RTSPClient; pub trait RTSPClientExtManual { fn attach<'a, P: Into>>(&self, context: P) -> SourceId; diff --git a/gstreamer-rtsp-server/src/rtsp_server.rs b/gstreamer-rtsp-server/src/rtsp_server.rs index ed0dcb989..5af8077f7 100644 --- a/gstreamer-rtsp-server/src/rtsp_server.rs +++ b/gstreamer-rtsp-server/src/rtsp_server.rs @@ -1,9 +1,9 @@ -use RTSPServer; use ffi; use glib; use glib::object::IsA; use glib::source::SourceId; use glib::translate::*; +use RTSPServer; pub trait RTSPServerExtManual { fn attach<'a, P: Into>>(&self, context: P) -> SourceId; diff --git a/gstreamer-rtsp-server/src/rtsp_session_pool.rs b/gstreamer-rtsp-server/src/rtsp_session_pool.rs index ffdf2a223..56b4fcd83 100644 --- a/gstreamer-rtsp-server/src/rtsp_session_pool.rs +++ b/gstreamer-rtsp-server/src/rtsp_session_pool.rs @@ -1,4 +1,3 @@ -use RTSPSessionPool; use ffi; use glib; use glib::object::IsA; @@ -8,6 +7,7 @@ use glib_ffi; use glib_ffi::{gboolean, gpointer}; use std::cell::RefCell; use std::mem::transmute; +use RTSPSessionPool; unsafe extern "C" fn trampoline_watch( pool: *mut ffi::GstRTSPSessionPool, diff --git a/gstreamer-rtsp-server/src/rtsp_token.rs b/gstreamer-rtsp-server/src/rtsp_token.rs index 0c73c975f..5d03752e7 100644 --- a/gstreamer-rtsp-server/src/rtsp_token.rs +++ b/gstreamer-rtsp-server/src/rtsp_token.rs @@ -1,8 +1,8 @@ use ffi; use glib; -use glib::StaticType; use glib::translate::*; use glib::value::ToSendValue; +use glib::StaticType; use gst; use gst_ffi; diff --git a/gstreamer-video/src/video_event.rs b/gstreamer-video/src/video_event.rs index 81d280124..fc0675f1b 100644 --- a/gstreamer-video/src/video_event.rs +++ b/gstreamer-video/src/video_event.rs @@ -9,8 +9,8 @@ use ffi; use gst_ffi; -use glib::ToSendValue; use glib::translate::{from_glib, from_glib_full, ToGlib}; +use glib::ToSendValue; use gst; use gst::MiniObject; use std::mem; diff --git a/gstreamer-video/src/video_overlay.rs b/gstreamer-video/src/video_overlay.rs index 6ec4181c9..fd72152ec 100644 --- a/gstreamer-video/src/video_overlay.rs +++ b/gstreamer-video/src/video_overlay.rs @@ -6,9 +6,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use VideoOverlay; use ffi; use libc::uintptr_t; +use VideoOverlay; use glib::IsA; diff --git a/gstreamer-webrtc/src/web_rtc_session_description.rs b/gstreamer-webrtc/src/web_rtc_session_description.rs index a9dd2057b..9eddaf48a 100644 --- a/gstreamer-webrtc/src/web_rtc_session_description.rs +++ b/gstreamer-webrtc/src/web_rtc_session_description.rs @@ -6,12 +6,12 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use WebRTCSDPType; -use WebRTCSessionDescription; use ffi; use glib::translate::*; use gst_sdp; use std::mem; +use WebRTCSDPType; +use WebRTCSessionDescription; impl WebRTCSessionDescription { pub fn new(type_: WebRTCSDPType, mut sdp: gst_sdp::SDPMessage) -> WebRTCSessionDescription { diff --git a/gstreamer/src/bin.rs b/gstreamer/src/bin.rs index 52f023dc0..61fa53423 100644 --- a/gstreamer/src/bin.rs +++ b/gstreamer/src/bin.rs @@ -10,8 +10,8 @@ use Bin; use Element; use glib; -use glib::IsA; use glib::translate::{from_glib, from_glib_full, FromGlibPtrContainer, ToGlib, ToGlibPtr}; +use glib::IsA; use ffi; diff --git a/gstreamer/src/buffer.rs b/gstreamer/src/buffer.rs index e1e0263fd..263e5436c 100644 --- a/gstreamer/src/buffer.rs +++ b/gstreamer/src/buffer.rs @@ -15,9 +15,9 @@ use std::slice; use std::u64; use std::usize; +use miniobject::*; use BufferFlags; use ClockTime; -use miniobject::*; use ffi; use glib; diff --git a/gstreamer/src/buffer_pool.rs b/gstreamer/src/buffer_pool.rs index 81c402ec9..b32a07850 100644 --- a/gstreamer/src/buffer_pool.rs +++ b/gstreamer/src/buffer_pool.rs @@ -10,8 +10,8 @@ use BufferPool; use Structure; use glib; -use glib::IsA; use glib::translate::{from_glib, from_glib_full, from_glib_none, ToGlib, ToGlibPtr, ToGlibPtrMut}; +use glib::IsA; use ffi; diff --git a/gstreamer/src/bufferlist.rs b/gstreamer/src/bufferlist.rs index 6d8f1649e..e19ffc6a2 100644 --- a/gstreamer/src/bufferlist.rs +++ b/gstreamer/src/bufferlist.rs @@ -8,13 +8,13 @@ use ffi; use glib; -use glib::StaticType; use glib::translate::{from_glib, from_glib_full}; +use glib::StaticType; use std::fmt; +use miniobject::*; use Buffer; use BufferRef; -use miniobject::*; pub type BufferList = GstRc; pub struct BufferListRef(ffi::GstBufferList); diff --git a/gstreamer/src/caps.rs b/gstreamer/src/caps.rs index 4f88770c2..5b3547219 100644 --- a/gstreamer/src/caps.rs +++ b/gstreamer/src/caps.rs @@ -424,7 +424,7 @@ mod tests { ("bool", &true), ("string", &"bla"), ("fraction", &Fraction::new(1, 2)), - ("array", &Array::new(&[&1, &2])) + ("array", &Array::new(&[&1, &2])), ], ).as_ref() ); diff --git a/gstreamer/src/child_proxy.rs b/gstreamer/src/child_proxy.rs index c643f2e94..a45e233bb 100644 --- a/gstreamer/src/child_proxy.rs +++ b/gstreamer/src/child_proxy.rs @@ -6,12 +6,12 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use ChildProxy; use ffi; use glib; use glib::object::IsA; use glib::translate::*; use std::ptr; +use ChildProxy; pub trait ChildProxyExtManual { fn get_child_property(&self, name: &str) -> Option; diff --git a/gstreamer/src/clock.rs b/gstreamer/src/clock.rs index 9daa7a3d1..c6d9bd6d7 100644 --- a/gstreamer/src/clock.rs +++ b/gstreamer/src/clock.rs @@ -6,15 +6,11 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use Clock; -use ClockReturn; -use ClockTime; -use ClockTimeDiff; use ffi; use glib; -use glib::IsA; use glib::source::CallbackGuard; use glib::translate::*; +use glib::IsA; use glib_ffi; use glib_ffi::{gboolean, gpointer}; use libc::c_void; @@ -22,6 +18,10 @@ use std::cmp; use std::mem; use std::mem::transmute; use std::ptr; +use Clock; +use ClockReturn; +use ClockTime; +use ClockTimeDiff; glib_wrapper! { pub struct ClockId(Shared); diff --git a/gstreamer/src/context.rs b/gstreamer/src/context.rs index 444763696..1ab248df3 100644 --- a/gstreamer/src/context.rs +++ b/gstreamer/src/context.rs @@ -12,11 +12,11 @@ use std::fmt; use ffi; use glib; -use glib::StaticType; use glib::translate::{from_glib, from_glib_full, ToGlib, ToGlibPtr}; +use glib::StaticType; -use StructureRef; use miniobject::*; +use StructureRef; pub type Context = GstRc; pub struct ContextRef(ffi::GstContext); diff --git a/gstreamer/src/date_time.rs b/gstreamer/src/date_time.rs index c46d2dfad..577aab7a2 100644 --- a/gstreamer/src/date_time.rs +++ b/gstreamer/src/date_time.rs @@ -6,8 +6,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use DateTime; use std::fmt; +use DateTime; impl fmt::Display for DateTime { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { diff --git a/gstreamer/src/device_provider.rs b/gstreamer/src/device_provider.rs index 9aef44ba2..2fe858f74 100644 --- a/gstreamer/src/device_provider.rs +++ b/gstreamer/src/device_provider.rs @@ -8,8 +8,8 @@ use DeviceProvider; -use glib::IsA; use glib::translate::ToGlibPtr; +use glib::IsA; use std::ffi::CStr; diff --git a/gstreamer/src/element.rs b/gstreamer/src/element.rs index 11973c2a4..70e82c75b 100644 --- a/gstreamer/src/element.rs +++ b/gstreamer/src/element.rs @@ -8,6 +8,15 @@ use Element; +use glib; +#[cfg(any(feature = "v1_10", feature = "dox"))] +use glib::object::Downcast; +#[cfg(any(feature = "v1_10", feature = "dox"))] +use glib::translate::FromGlibPtrBorrow; +use glib::translate::{from_glib, from_glib_full, from_glib_none, FromGlib, FromGlibPtrContainer, + ToGlib, ToGlibPtr}; +use glib::IsA; +use miniobject::MiniObject; use Event; use Format; use FormattedValue; @@ -16,15 +25,6 @@ use Pad; use PadTemplate; use QueryRef; use SpecificFormattedValue; -use glib; -use glib::IsA; -#[cfg(any(feature = "v1_10", feature = "dox"))] -use glib::object::Downcast; -#[cfg(any(feature = "v1_10", feature = "dox"))] -use glib::translate::FromGlibPtrBorrow; -use glib::translate::{from_glib, from_glib_full, from_glib_none, FromGlib, FromGlibPtrContainer, - ToGlib, ToGlibPtr}; -use miniobject::MiniObject; use std::ffi::CStr; use std::mem; diff --git a/gstreamer/src/enums.rs b/gstreamer/src/enums.rs index dd6275f4d..c10c079d2 100644 --- a/gstreamer/src/enums.rs +++ b/gstreamer/src/enums.rs @@ -6,13 +6,13 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +use std::cmp; +use std::error::Error; +use std::fmt; use ClockReturn; use FlowReturn; use PadLinkReturn; use StateChangeReturn; -use std::cmp; -use std::error::Error; -use std::fmt; use glib::translate::ToGlib; diff --git a/gstreamer/src/event.rs b/gstreamer/src/event.rs index 2b89a4be4..e3593495f 100644 --- a/gstreamer/src/event.rs +++ b/gstreamer/src/event.rs @@ -6,10 +6,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use GenericFormattedValue; use ffi; use miniobject::*; use structure::*; +use GenericFormattedValue; use std::cmp; use std::ffi::CStr; diff --git a/gstreamer/src/format.rs b/gstreamer/src/format.rs index e8f81b866..693372a1a 100644 --- a/gstreamer/src/format.rs +++ b/gstreamer/src/format.rs @@ -6,10 +6,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use ClockTime; -use Format; use muldiv::MulDiv; use std::ops; +use ClockTime; +use Format; #[derive(PartialEq, Eq, Hash, Clone, Copy, Debug)] pub enum GenericFormattedValue { diff --git a/gstreamer/src/ghost_pad.rs b/gstreamer/src/ghost_pad.rs index 55fe887d0..cdf13272f 100644 --- a/gstreamer/src/ghost_pad.rs +++ b/gstreamer/src/ghost_pad.rs @@ -6,15 +6,15 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +use ffi; +use glib::object::Downcast; +use glib::object::IsA; +use glib::translate::*; use GhostPad; use Object; use Pad; use PadMode; use PadTemplate; -use ffi; -use glib::object::Downcast; -use glib::object::IsA; -use glib::translate::*; impl GhostPad { pub fn new<'a, P: Into>, Q: IsA>(name: P, target: &Q) -> Option { diff --git a/gstreamer/src/gobject.rs b/gstreamer/src/gobject.rs index d4f20ae36..0bf005787 100644 --- a/gstreamer/src/gobject.rs +++ b/gstreamer/src/gobject.rs @@ -1,6 +1,6 @@ use glib; -use glib::IsA; use glib::translate::ToGlibPtr; +use glib::IsA; use ffi; diff --git a/gstreamer/src/iterator.rs b/gstreamer/src/iterator.rs index a529cb0e8..fd8794968 100644 --- a/gstreamer/src/iterator.rs +++ b/gstreamer/src/iterator.rs @@ -8,10 +8,10 @@ use ffi; use glib; -use glib::StaticType; -use glib::Value; use glib::translate::*; use glib::value::{FromValueOptional, ToValue}; +use glib::StaticType; +use glib::Value; use glib_ffi; use glib_ffi::{gconstpointer, gpointer}; use gobject_ffi; diff --git a/gstreamer/src/lib.rs b/gstreamer/src/lib.rs index 7b18c5570..f0f397526 100644 --- a/gstreamer/src/lib.rs +++ b/gstreamer/src/lib.rs @@ -133,9 +133,9 @@ mod parse_context; mod proxy_pad; mod tag_setter; pub use bin::BinExtManual; +pub use element::{ElementExtManual, ElementMessageType, NotifyWatchId}; pub use element::{ELEMENT_METADATA_AUTHOR, ELEMENT_METADATA_DESCRIPTION, ELEMENT_METADATA_DOC_URI, ELEMENT_METADATA_ICON_NAME, ELEMENT_METADATA_KLASS, ELEMENT_METADATA_LONGNAME}; -pub use element::{ElementExtManual, ElementMessageType, NotifyWatchId}; pub use object::GstObjectExtManual; // OS dependent Bus extensions (also import the other plateform trait for doc) diff --git a/gstreamer/src/log.rs b/gstreamer/src/log.rs index e34713f34..1a45f6253 100644 --- a/gstreamer/src/log.rs +++ b/gstreamer/src/log.rs @@ -15,8 +15,8 @@ use std::ptr; use ffi; use gobject_ffi; -use glib::IsA; use glib::translate::{from_glib, ToGlib, ToGlibPtr}; +use glib::IsA; #[derive(PartialEq, Eq, Clone, Copy)] pub struct DebugCategory(ptr::NonNull); diff --git a/gstreamer/src/message.rs b/gstreamer/src/message.rs index 4c0c74ed2..3ee33a5be 100644 --- a/gstreamer/src/message.rs +++ b/gstreamer/src/message.rs @@ -6,15 +6,15 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +use ffi; +use miniobject::*; +use structure::*; use GenericFormattedValue; use GroupId; use GstObjectExt; use Object; use Seqnum; use TagList; -use ffi; -use miniobject::*; -use structure::*; use std::ffi::CStr; use std::fmt; @@ -23,10 +23,10 @@ use std::ops::Deref; use std::ptr; use glib; -use glib::Cast; -use glib::IsA; use glib::translate::{from_glib, from_glib_full, from_glib_none, mut_override, ToGlib, ToGlibPtr}; use glib::value::ToSendValue; +use glib::Cast; +use glib::IsA; #[repr(C)] pub struct MessageRef(ffi::GstMessage); diff --git a/gstreamer/src/object.rs b/gstreamer/src/object.rs index 8548e1e09..9654027db 100644 --- a/gstreamer/src/object.rs +++ b/gstreamer/src/object.rs @@ -7,10 +7,10 @@ // except according to those terms. use glib; -use glib::IsA; use glib::object::{Downcast, ObjectExt}; use glib::signal::SignalHandlerId; use glib::translate::ToGlibPtr; +use glib::IsA; use gobject_ffi; diff --git a/gstreamer/src/pad.rs b/gstreamer/src/pad.rs index 73be6fc5f..c8869250a 100644 --- a/gstreamer/src/pad.rs +++ b/gstreamer/src/pad.rs @@ -6,6 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +use miniobject::MiniObject; use Buffer; use BufferList; use Event; @@ -20,7 +21,6 @@ use Query; use QueryRef; use SpecificFormattedValue; use StaticPadTemplate; -use miniobject::MiniObject; use std::cell::RefCell; use std::mem; @@ -28,10 +28,10 @@ use std::mem::transmute; use std::ptr; use glib; -use glib::Object; use glib::source::CallbackGuard; use glib::translate::{from_glib, from_glib_borrow, from_glib_full, from_glib_none, mut_override, FromGlib, ToGlib, ToGlibPtr}; +use glib::Object; use glib::{IsA, StaticType}; use glib_ffi; use glib_ffi::gpointer; diff --git a/gstreamer/src/pad_template.rs b/gstreamer/src/pad_template.rs index f3e04fc9b..1913f5063 100644 --- a/gstreamer/src/pad_template.rs +++ b/gstreamer/src/pad_template.rs @@ -6,11 +6,11 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +#[cfg(any(feature = "v1_14", feature = "dox"))] +use glib::translate::*; use PadTemplate; #[cfg(any(feature = "v1_14", feature = "dox"))] use StaticPadTemplate; -#[cfg(any(feature = "v1_14", feature = "dox"))] -use glib::translate::*; #[cfg(any(feature = "v1_14", feature = "dox"))] use ffi; diff --git a/gstreamer/src/plugin.rs b/gstreamer/src/plugin.rs index 7b72f64e6..f922faf19 100644 --- a/gstreamer/src/plugin.rs +++ b/gstreamer/src/plugin.rs @@ -6,10 +6,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +use ffi; use Plugin; use Structure; use StructureRef; -use ffi; use glib::translate::*; diff --git a/gstreamer/src/promise.rs b/gstreamer/src/promise.rs index 62c115dee..a8f0324fe 100644 --- a/gstreamer/src/promise.rs +++ b/gstreamer/src/promise.rs @@ -6,15 +6,15 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use PromiseResult; -use Structure; -use StructureRef; use ffi; use glib::translate::*; use glib_ffi; use gobject_ffi; use std::mem; use std::ptr; +use PromiseResult; +use Structure; +use StructureRef; glib_wrapper! { pub struct Promise(Shared); diff --git a/gstreamer/src/proxy_pad.rs b/gstreamer/src/proxy_pad.rs index ba5a91b98..b949ebff3 100644 --- a/gstreamer/src/proxy_pad.rs +++ b/gstreamer/src/proxy_pad.rs @@ -6,16 +6,16 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +use std::ptr; use Buffer; use BufferList; use FlowReturn; use Object; use Pad; use ProxyPad; -use std::ptr; -use glib::IsA; use glib::translate::{from_glib, from_glib_full, ToGlibPtr}; +use glib::IsA; use ffi; diff --git a/gstreamer/src/query.rs b/gstreamer/src/query.rs index b912b56ae..c1beac6c2 100644 --- a/gstreamer/src/query.rs +++ b/gstreamer/src/query.rs @@ -6,10 +6,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use GenericFormattedValue; use ffi; use miniobject::*; use structure::*; +use GenericFormattedValue; use std::ffi::CStr; use std::fmt; diff --git a/gstreamer/src/sample.rs b/gstreamer/src/sample.rs index 634f9fde8..b65778c8a 100644 --- a/gstreamer/src/sample.rs +++ b/gstreamer/src/sample.rs @@ -12,9 +12,10 @@ use std::ptr; use ffi; use glib; -use glib::StaticType; use glib::translate::{from_glib, from_glib_full, from_glib_none, mut_override, ToGlibPtr}; +use glib::StaticType; +use miniobject::*; use Buffer; use BufferList; use Caps; @@ -22,7 +23,6 @@ use FormattedSegment; use FormattedValue; use Segment; use StructureRef; -use miniobject::*; pub type Sample = GstRc; pub struct SampleRef(ffi::GstSample); diff --git a/gstreamer/src/segment.rs b/gstreamer/src/segment.rs index c26897ab1..75d5389ea 100644 --- a/gstreamer/src/segment.rs +++ b/gstreamer/src/segment.rs @@ -6,11 +6,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use Format; -use FormattedValue; -use GenericFormattedValue; -use SeekFlags; -use SeekType; use ffi; use glib; use glib::translate::*; @@ -20,6 +15,11 @@ use std::fmt; use std::marker::PhantomData; use std::mem; use std::ptr; +use Format; +use FormattedValue; +use GenericFormattedValue; +use SeekFlags; +use SeekType; pub type Segment = FormattedSegment; #[repr(C)] diff --git a/gstreamer/src/tag_setter.rs b/gstreamer/src/tag_setter.rs index 93ef95801..38257bc14 100644 --- a/gstreamer/src/tag_setter.rs +++ b/gstreamer/src/tag_setter.rs @@ -6,13 +6,13 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use TagMergeMode; -use TagSetter; use ffi; use glib::object::IsA; use glib::translate::*; use glib::value::ToSendValue; use tags::*; +use TagMergeMode; +use TagSetter; pub trait TagSetterExtManual { fn add<'a, T: Tag<'a>>(&self, value: T::TagType, mode: TagMergeMode) diff --git a/gstreamer/src/tags.rs b/gstreamer/src/tags.rs index b9a1c6c0f..45165ed43 100644 --- a/gstreamer/src/tags.rs +++ b/gstreamer/src/tags.rs @@ -13,9 +13,9 @@ use std::mem; use ffi; use glib; -use glib::StaticType; use glib::translate::{from_glib, from_glib_full, ToGlib, ToGlibPtr, ToGlibPtrMut}; use glib::value::{FromValueOptional, SetValue, ToSendValue, TypedValue, Value}; +use glib::StaticType; use miniobject::*; diff --git a/gstreamer/src/toc.rs b/gstreamer/src/toc.rs index 930d26f82..f413a89c2 100644 --- a/gstreamer/src/toc.rs +++ b/gstreamer/src/toc.rs @@ -16,12 +16,12 @@ use glib; use glib::translate::{from_glib, from_glib_full, from_glib_none, FromGlibPtrContainer, ToGlib, ToGlibPtr}; +use miniobject::*; use TagList; use TagMergeMode; use TocEntryType; use TocLoopType; use TocScope; -use miniobject::*; pub type Toc = GstRc; pub struct TocRef(ffi::GstToc); diff --git a/gstreamer/src/typefind.rs b/gstreamer/src/typefind.rs index aa330bd3d..8e4d71901 100644 --- a/gstreamer/src/typefind.rs +++ b/gstreamer/src/typefind.rs @@ -6,11 +6,11 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +use ffi; use Caps; use Plugin; use TypeFindFactory; use TypeFindProbability; -use ffi; use glib::translate::*; use glib_ffi; diff --git a/tutorials/src/bin/basic-tutorial-4.rs b/tutorials/src/bin/basic-tutorial-4.rs index 477304417..e2772cd2b 100644 --- a/tutorials/src/bin/basic-tutorial-4.rs +++ b/tutorials/src/bin/basic-tutorial-4.rs @@ -1,6 +1,6 @@ extern crate gstreamer as gst; -use gst::MessageView; use gst::prelude::*; +use gst::MessageView; use std::io; use std::io::Write; diff --git a/tutorials/src/bin/basic-tutorial-6.rs b/tutorials/src/bin/basic-tutorial-6.rs index 05703add9..271a5bab7 100644 --- a/tutorials/src/bin/basic-tutorial-6.rs +++ b/tutorials/src/bin/basic-tutorial-6.rs @@ -1,6 +1,6 @@ extern crate gstreamer as gst; -use gst::MessageView; use gst::prelude::*; +use gst::MessageView; #[path = "../tutorials-common.rs"] mod tutorials_common;