From 9e30687d8e9da66740a2c4fc668458acfa1a3551 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sun, 10 Nov 2019 18:07:13 +0100 Subject: [PATCH] Fix glib reexports --- gstreamer-app/src/lib.rs | 2 -- gstreamer-audio/src/lib.rs | 2 -- gstreamer-base/src/lib.rs | 2 -- gstreamer-check/src/lib.rs | 2 -- gstreamer-editing-services/src/lib.rs | 6 +----- gstreamer-gl/src/lib.rs | 2 -- gstreamer-net/src/lib.rs | 2 -- gstreamer-pbutils/src/lib.rs | 2 -- gstreamer-player/src/lib.rs | 2 -- gstreamer-rtp/src/lib.rs | 2 -- gstreamer-rtsp-server/src/lib.rs | 2 -- gstreamer-rtsp/src/lib.rs | 2 -- gstreamer-sdp/src/lib.rs | 2 -- gstreamer-video/src/lib.rs | 2 -- gstreamer-webrtc/src/lib.rs | 2 -- gstreamer/src/lib.rs | 2 -- 16 files changed, 1 insertion(+), 35 deletions(-) diff --git a/gstreamer-app/src/lib.rs b/gstreamer-app/src/lib.rs index 3d118dc0b..8096ec7f4 100644 --- a/gstreamer-app/src/lib.rs +++ b/gstreamer-app/src/lib.rs @@ -22,8 +22,6 @@ macro_rules! skip_assert_initialized { () => {}; } -pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue, Value}; - #[allow(clippy::unreadable_literal)] #[allow(clippy::too_many_arguments)] #[allow(clippy::match_same_arms)] diff --git a/gstreamer-audio/src/lib.rs b/gstreamer-audio/src/lib.rs index 74e88910a..eacc0ea47 100644 --- a/gstreamer-audio/src/lib.rs +++ b/gstreamer-audio/src/lib.rs @@ -33,8 +33,6 @@ macro_rules! skip_assert_initialized { () => {}; } -pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue, Value}; - #[allow(clippy::unreadable_literal)] #[allow(clippy::too_many_arguments)] #[allow(clippy::match_same_arms)] diff --git a/gstreamer-base/src/lib.rs b/gstreamer-base/src/lib.rs index d31cbad66..f5e4f3e32 100644 --- a/gstreamer-base/src/lib.rs +++ b/gstreamer-base/src/lib.rs @@ -32,8 +32,6 @@ macro_rules! skip_assert_initialized { () => {}; } -pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue, Value}; - #[allow(clippy::unreadable_literal)] #[allow(clippy::too_many_arguments)] #[allow(clippy::match_same_arms)] diff --git a/gstreamer-check/src/lib.rs b/gstreamer-check/src/lib.rs index 7a2c38220..8f603d8c3 100644 --- a/gstreamer-check/src/lib.rs +++ b/gstreamer-check/src/lib.rs @@ -23,8 +23,6 @@ macro_rules! assert_initialized_main_thread { }; } -pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue, Value}; - #[allow(clippy::unreadable_literal)] #[allow(clippy::too_many_arguments)] #[allow(clippy::match_same_arms)] diff --git a/gstreamer-editing-services/src/lib.rs b/gstreamer-editing-services/src/lib.rs index 7fff72336..b5ffc82a4 100644 --- a/gstreamer-editing-services/src/lib.rs +++ b/gstreamer-editing-services/src/lib.rs @@ -27,11 +27,7 @@ extern crate gio; static GES_INIT: Once = Once::new(); -pub use glib::{ - Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue, Value, -}; - -pub fn init() -> Result<(), glib::Error> { +pub fn init() -> Result<(), glib::BoolError> { if gst::init().is_err() { return Err(glib_bool_error!("Could not initialize GStreamer.")); } diff --git a/gstreamer-gl/src/lib.rs b/gstreamer-gl/src/lib.rs index 5a0c80a7d..95fa1f180 100644 --- a/gstreamer-gl/src/lib.rs +++ b/gstreamer-gl/src/lib.rs @@ -35,8 +35,6 @@ macro_rules! skip_assert_initialized { () => {}; } -pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue, Value}; - #[allow(clippy::unreadable_literal)] #[allow(clippy::too_many_arguments)] #[allow(clippy::match_same_arms)] diff --git a/gstreamer-net/src/lib.rs b/gstreamer-net/src/lib.rs index 34d488297..a8cc89b43 100644 --- a/gstreamer-net/src/lib.rs +++ b/gstreamer-net/src/lib.rs @@ -24,8 +24,6 @@ macro_rules! assert_initialized_main_thread { }; } -pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue, Value}; - #[allow(clippy::unreadable_literal)] #[allow(clippy::too_many_arguments)] #[allow(clippy::match_same_arms)] diff --git a/gstreamer-pbutils/src/lib.rs b/gstreamer-pbutils/src/lib.rs index c7d2e27ee..9a24090b5 100644 --- a/gstreamer-pbutils/src/lib.rs +++ b/gstreamer-pbutils/src/lib.rs @@ -37,8 +37,6 @@ macro_rules! skip_assert_initialized { () => {}; } -pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue, Value}; - #[allow(clippy::unreadable_literal)] #[allow(clippy::too_many_arguments)] #[allow(clippy::match_same_arms)] diff --git a/gstreamer-player/src/lib.rs b/gstreamer-player/src/lib.rs index 7f479e094..18ff06569 100644 --- a/gstreamer-player/src/lib.rs +++ b/gstreamer-player/src/lib.rs @@ -26,8 +26,6 @@ macro_rules! assert_initialized_main_thread { () => {}; } -pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue, Value}; - #[allow(clippy::unreadable_literal)] #[allow(clippy::too_many_arguments)] #[allow(clippy::match_same_arms)] diff --git a/gstreamer-rtp/src/lib.rs b/gstreamer-rtp/src/lib.rs index 6893dd1c2..c24d4f2f2 100644 --- a/gstreamer-rtp/src/lib.rs +++ b/gstreamer-rtp/src/lib.rs @@ -32,8 +32,6 @@ macro_rules! skip_assert_initialized { () => {}; } -pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue, Value}; - #[allow(clippy::unreadable_literal)] #[allow(clippy::too_many_arguments)] #[allow(clippy::match_same_arms)] diff --git a/gstreamer-rtsp-server/src/lib.rs b/gstreamer-rtsp-server/src/lib.rs index 6ecb15650..7f62ff28a 100644 --- a/gstreamer-rtsp-server/src/lib.rs +++ b/gstreamer-rtsp-server/src/lib.rs @@ -40,8 +40,6 @@ macro_rules! skip_assert_initialized { () => {}; } -pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue, Value}; - #[allow(clippy::unreadable_literal)] #[allow(clippy::too_many_arguments)] #[allow(clippy::match_same_arms)] diff --git a/gstreamer-rtsp/src/lib.rs b/gstreamer-rtsp/src/lib.rs index 3a86fa1eb..fb3ba7894 100644 --- a/gstreamer-rtsp/src/lib.rs +++ b/gstreamer-rtsp/src/lib.rs @@ -32,8 +32,6 @@ macro_rules! skip_assert_initialized { () => {}; } -pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue, Value}; - #[allow(clippy::unreadable_literal)] #[allow(clippy::too_many_arguments)] #[allow(clippy::match_same_arms)] diff --git a/gstreamer-sdp/src/lib.rs b/gstreamer-sdp/src/lib.rs index 1b68a13ee..2ea82882f 100644 --- a/gstreamer-sdp/src/lib.rs +++ b/gstreamer-sdp/src/lib.rs @@ -26,8 +26,6 @@ macro_rules! skip_assert_initialized { () => {}; } -pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue, Value}; - #[allow(clippy::unreadable_literal)] #[allow(clippy::too_many_arguments)] #[allow(clippy::match_same_arms)] diff --git a/gstreamer-video/src/lib.rs b/gstreamer-video/src/lib.rs index b0dcdef6c..897319bce 100644 --- a/gstreamer-video/src/lib.rs +++ b/gstreamer-video/src/lib.rs @@ -35,8 +35,6 @@ macro_rules! skip_assert_initialized { () => {}; } -pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue, Value}; - #[allow(clippy::unreadable_literal)] #[allow(clippy::too_many_arguments)] #[allow(clippy::match_same_arms)] diff --git a/gstreamer-webrtc/src/lib.rs b/gstreamer-webrtc/src/lib.rs index 49497824d..1775a6866 100644 --- a/gstreamer-webrtc/src/lib.rs +++ b/gstreamer-webrtc/src/lib.rs @@ -29,8 +29,6 @@ macro_rules! skip_assert_initialized { () => {}; } -pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue, Value}; - #[allow(clippy::unreadable_literal)] #[allow(clippy::too_many_arguments)] #[allow(clippy::match_same_arms)] diff --git a/gstreamer/src/lib.rs b/gstreamer/src/lib.rs index c63083f2a..4f06bb7c9 100644 --- a/gstreamer/src/lib.rs +++ b/gstreamer/src/lib.rs @@ -59,8 +59,6 @@ macro_rules! skip_assert_initialized { () => {}; } -pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue, Value}; - #[allow(clippy::unreadable_literal)] #[allow(clippy::too_many_arguments)] #[allow(clippy::match_same_arms)]