From e6a81edb3c1a534b7caf6af391be748d8f7183f4 Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Tue, 27 Apr 2021 09:30:13 +0200 Subject: [PATCH] prelude: Remove redundant reexports already provided by other preludes For cleanliness the prelude module only needs to reexport preludes from direct, "top-most" crates, which themselves take care of reexporting preludes from its dependencies again. This shaves off some code while maintaining the same set of exports. --- gstreamer-app/src/lib.rs | 6 +----- gstreamer-audio/src/lib.rs | 6 +----- gstreamer-audio/src/subclass/mod.rs | 4 ---- gstreamer-base/src/lib.rs | 4 +--- gstreamer-base/src/subclass/mod.rs | 2 -- gstreamer-check/src/lib.rs | 4 +--- gstreamer-controller/src/lib.rs | 2 -- gstreamer-editing-services/src/lib.rs | 6 +----- gstreamer-gl/src/lib.rs | 8 +------- gstreamer-gl/src/subclass/mod.rs | 3 +++ gstreamer-net/src/lib.rs | 4 +--- gstreamer-pbutils/src/lib.rs | 4 +--- gstreamer-player/src/lib.rs | 6 +----- gstreamer-player/src/subclass/mod.rs | 2 -- gstreamer-rtp/src/lib.rs | 4 +--- gstreamer-rtsp-server/src/lib.rs | 8 +------- gstreamer-rtsp-server/src/subclass/mod.rs | 2 -- gstreamer-rtsp/src/lib.rs | 6 +----- gstreamer-sdp/src/lib.rs | 4 +--- gstreamer-video/src/lib.rs | 6 +----- gstreamer-video/src/subclass/mod.rs | 4 ---- gstreamer-webrtc/src/lib.rs | 6 +----- 22 files changed, 18 insertions(+), 83 deletions(-) diff --git a/gstreamer-app/src/lib.rs b/gstreamer-app/src/lib.rs index a7d3ad833..541b05746 100644 --- a/gstreamer-app/src/lib.rs +++ b/gstreamer-app/src/lib.rs @@ -24,12 +24,8 @@ pub mod app_src; pub use crate::app_src::AppSrcCallbacks; // Re-export all the traits in a prelude module, so that applications -// can always "use gst::prelude::*" without getting conflicts +// can always "use gst_app::prelude::*" without getting conflicts pub mod prelude { - #[doc(hidden)] - pub use glib::prelude::*; - #[doc(hidden)] - pub use gst::prelude::*; #[doc(hidden)] pub use gst_base::prelude::*; diff --git a/gstreamer-audio/src/lib.rs b/gstreamer-audio/src/lib.rs index abd764d12..b820f19e3 100644 --- a/gstreamer-audio/src/lib.rs +++ b/gstreamer-audio/src/lib.rs @@ -56,12 +56,8 @@ mod audio_converter; pub use crate::audio_converter::AudioConverterConfig; // Re-export all the traits in a prelude module, so that applications -// can always "use gst::prelude::*" without getting conflicts +// can always "use gst_audio::prelude::*" without getting conflicts pub mod prelude { - #[doc(hidden)] - pub use glib::prelude::*; - #[doc(hidden)] - pub use gst::prelude::*; #[doc(hidden)] pub use gst_base::prelude::*; diff --git a/gstreamer-audio/src/subclass/mod.rs b/gstreamer-audio/src/subclass/mod.rs index 92ab27bfd..825ef9ed8 100644 --- a/gstreamer-audio/src/subclass/mod.rs +++ b/gstreamer-audio/src/subclass/mod.rs @@ -8,10 +8,6 @@ mod audio_sink; mod audio_src; pub mod prelude { - #[doc(hidden)] - pub use glib::subclass::prelude::*; - #[doc(hidden)] - pub use gst::subclass::prelude::*; #[doc(hidden)] pub use gst_base::subclass::prelude::*; diff --git a/gstreamer-base/src/lib.rs b/gstreamer-base/src/lib.rs index c8daaa56e..4d6ac0c0e 100644 --- a/gstreamer-base/src/lib.rs +++ b/gstreamer-base/src/lib.rs @@ -52,10 +52,8 @@ pub const BASE_PARSE_FLOW_DROPPED: gst::FlowSuccess = gst::FlowSuccess::CustomSu pub const AGGREGATOR_FLOW_NEED_DATA: gst::FlowError = gst::FlowError::CustomError; // Re-export all the traits in a prelude module, so that applications -// can always "use gst::prelude::*" without getting conflicts +// can always "use gst_base::prelude::*" without getting conflicts pub mod prelude { - #[doc(hidden)] - pub use glib::prelude::*; #[doc(hidden)] pub use gst::prelude::*; diff --git a/gstreamer-base/src/subclass/mod.rs b/gstreamer-base/src/subclass/mod.rs index 7cb2f6e47..3dcf461d2 100644 --- a/gstreamer-base/src/subclass/mod.rs +++ b/gstreamer-base/src/subclass/mod.rs @@ -20,8 +20,6 @@ mod aggregator; mod aggregator_pad; pub mod prelude { - #[doc(hidden)] - pub use glib::subclass::prelude::*; #[doc(hidden)] pub use gst::subclass::prelude::*; diff --git a/gstreamer-check/src/lib.rs b/gstreamer-check/src/lib.rs index 2d80aa9b1..6683607cc 100644 --- a/gstreamer-check/src/lib.rs +++ b/gstreamer-check/src/lib.rs @@ -27,10 +27,8 @@ pub mod harness; pub use crate::harness::Harness; // Re-export all the traits in a prelude module, so that applications -// can always "use gst::prelude::*" without getting conflicts +// can always "use gst_check::prelude::*" without getting conflicts pub mod prelude { - #[doc(hidden)] - pub use glib::prelude::*; #[doc(hidden)] pub use gst::prelude::*; diff --git a/gstreamer-controller/src/lib.rs b/gstreamer-controller/src/lib.rs index 8877bb614..c476d4cde 100644 --- a/gstreamer-controller/src/lib.rs +++ b/gstreamer-controller/src/lib.rs @@ -27,8 +27,6 @@ pub use crate::auto::*; use crate::control_point::*; pub mod prelude { - #[doc(hidden)] - pub use glib::prelude::*; #[doc(hidden)] pub use gst::prelude::*; diff --git a/gstreamer-editing-services/src/lib.rs b/gstreamer-editing-services/src/lib.rs index ecfdf9ef2..8a5129409 100644 --- a/gstreamer-editing-services/src/lib.rs +++ b/gstreamer-editing-services/src/lib.rs @@ -57,15 +57,11 @@ pub use crate::auto::*; mod timeline_element; // Re-export all the traits in a prelude module, so that applications -// can always "use gst::prelude::*" without getting conflicts +// can always "use ges::prelude::*" without getting conflicts pub mod prelude { #[doc(hidden)] pub use gio::prelude::*; #[doc(hidden)] - pub use glib::prelude::*; - #[doc(hidden)] - pub use gst::prelude::*; - #[doc(hidden)] pub use gst_base::prelude::*; #[doc(hidden)] pub use gst_pbutils::prelude::*; diff --git a/gstreamer-gl/src/lib.rs b/gstreamer-gl/src/lib.rs index dc0734d10..6452e3849 100644 --- a/gstreamer-gl/src/lib.rs +++ b/gstreamer-gl/src/lib.rs @@ -40,14 +40,8 @@ mod gl_memory; pub use crate::gl_memory::*; // Re-export all the traits in a prelude module, so that applications -// can always "use gst::prelude::*" without getting conflicts +// can always "use gst_gl::prelude::*" without getting conflicts pub mod prelude { - #[doc(hidden)] - pub use glib::prelude::*; - #[doc(hidden)] - pub use gst::prelude::*; - #[doc(hidden)] - pub use gst_base::prelude::*; #[doc(hidden)] pub use gst_video::prelude::*; diff --git a/gstreamer-gl/src/subclass/mod.rs b/gstreamer-gl/src/subclass/mod.rs index ed0c8b9af..271fcb228 100644 --- a/gstreamer-gl/src/subclass/mod.rs +++ b/gstreamer-gl/src/subclass/mod.rs @@ -4,6 +4,9 @@ mod gl_filter; pub use self::gl_filter::GLFilterMode; pub mod prelude { + #[doc(hidden)] + pub use gst_video::subclass::prelude::*; + pub use super::gl_base_filter::{GLBaseFilterImpl, GLBaseFilterImplExt}; pub use super::gl_filter::{GLFilterImpl, GLFilterImplExt}; } diff --git a/gstreamer-net/src/lib.rs b/gstreamer-net/src/lib.rs index 4132907d3..92148c9b9 100644 --- a/gstreamer-net/src/lib.rs +++ b/gstreamer-net/src/lib.rs @@ -32,13 +32,11 @@ pub use crate::net_address_meta::*; mod net_address_meta; // Re-export all the traits in a prelude module, so that applications -// can always "use gst::prelude::*" without getting conflicts +// can always "use gst_net::prelude::*" without getting conflicts pub mod prelude { #[doc(hidden)] pub use gio::prelude::*; #[doc(hidden)] - pub use glib::prelude::*; - #[doc(hidden)] pub use gst::prelude::*; pub use crate::auto::traits::*; diff --git a/gstreamer-pbutils/src/lib.rs b/gstreamer-pbutils/src/lib.rs index d151ec589..43550014a 100644 --- a/gstreamer-pbutils/src/lib.rs +++ b/gstreamer-pbutils/src/lib.rs @@ -48,10 +48,8 @@ pub mod functions; pub use crate::functions::*; // Re-export all the traits in a prelude module, so that applications -// can always "use gst::prelude::*" without getting conflicts +// can always "use gst_pbutils::prelude::*" without getting conflicts pub mod prelude { - #[doc(hidden)] - pub use glib::prelude::*; #[doc(hidden)] pub use gst::prelude::*; diff --git a/gstreamer-player/src/lib.rs b/gstreamer-player/src/lib.rs index e92e12eec..da25898ec 100644 --- a/gstreamer-player/src/lib.rs +++ b/gstreamer-player/src/lib.rs @@ -35,12 +35,8 @@ mod player_video_overlay_video_renderer; mod player_visualization; // Re-export all the traits in a prelude module, so that applications -// can always "use gst::prelude::*" without getting conflicts +// can always "use gst_player::prelude::*" without getting conflicts pub mod prelude { - #[doc(hidden)] - pub use glib::prelude::*; - #[doc(hidden)] - pub use gst::prelude::*; #[doc(hidden)] pub use gst_video::prelude::*; diff --git a/gstreamer-player/src/subclass/mod.rs b/gstreamer-player/src/subclass/mod.rs index c08a24484..49bd550f1 100644 --- a/gstreamer-player/src/subclass/mod.rs +++ b/gstreamer-player/src/subclass/mod.rs @@ -3,8 +3,6 @@ mod player_video_renderer; pub mod prelude { - #[doc(hidden)] - pub use glib::subclass::prelude::*; #[doc(hidden)] pub use gst::subclass::prelude::*; diff --git a/gstreamer-rtp/src/lib.rs b/gstreamer-rtp/src/lib.rs index cff99a757..f77b3039c 100644 --- a/gstreamer-rtp/src/lib.rs +++ b/gstreamer-rtp/src/lib.rs @@ -29,10 +29,8 @@ pub mod rtp_buffer; pub use crate::rtp_buffer::{compare_seqnum, RTPBuffer}; // Re-export all the traits in a prelude module, so that applications -// can always "use gst::prelude::*" without getting conflicts +// can always "use gst_rtp::prelude::*" without getting conflicts pub mod prelude { - #[doc(hidden)] - pub use glib::prelude::*; #[doc(hidden)] pub use gst::prelude::*; diff --git a/gstreamer-rtsp-server/src/lib.rs b/gstreamer-rtsp-server/src/lib.rs index 82bf7a49e..5527db511 100644 --- a/gstreamer-rtsp-server/src/lib.rs +++ b/gstreamer-rtsp-server/src/lib.rs @@ -110,20 +110,14 @@ pub static RTSP_TOKEN_TRANSPORT_CLIENT_SETTINGS: Lazy<&'static str> = Lazy::new( }); // Re-export all the traits in a prelude module, so that applications -// can always "use gst::prelude::*" without getting conflicts +// can always "use gst_rtsp_server::prelude::*" without getting conflicts pub mod prelude { #[doc(hidden)] pub use gio::prelude::*; #[doc(hidden)] - pub use glib::prelude::*; - #[doc(hidden)] - pub use gst::prelude::*; - #[doc(hidden)] pub use gst_net::prelude::*; #[doc(hidden)] pub use gst_rtsp::prelude::*; - #[doc(hidden)] - pub use gst_sdp::prelude::*; pub use crate::auto::traits::*; diff --git a/gstreamer-rtsp-server/src/subclass/mod.rs b/gstreamer-rtsp-server/src/subclass/mod.rs index 16835f20a..da6e098ff 100644 --- a/gstreamer-rtsp-server/src/subclass/mod.rs +++ b/gstreamer-rtsp-server/src/subclass/mod.rs @@ -10,8 +10,6 @@ mod rtsp_server; pub use self::rtsp_media::SDPInfo; pub mod prelude { - #[doc(hidden)] - pub use glib::subclass::prelude::*; #[doc(hidden)] pub use gst::subclass::prelude::*; diff --git a/gstreamer-rtsp/src/lib.rs b/gstreamer-rtsp/src/lib.rs index 4d594e887..be299c537 100644 --- a/gstreamer-rtsp/src/lib.rs +++ b/gstreamer-rtsp/src/lib.rs @@ -26,12 +26,8 @@ mod auto; pub use crate::auto::*; // Re-export all the traits in a prelude module, so that applications -// can always "use gst::prelude::*" without getting conflicts +// can always "use gst_rtsp::prelude::*" without getting conflicts pub mod prelude { - #[doc(hidden)] - pub use glib::prelude::*; - #[doc(hidden)] - pub use gst::prelude::*; #[doc(hidden)] pub use gst_sdp::prelude::*; diff --git a/gstreamer-sdp/src/lib.rs b/gstreamer-sdp/src/lib.rs index e6c9b649b..2cfacb04d 100644 --- a/gstreamer-sdp/src/lib.rs +++ b/gstreamer-sdp/src/lib.rs @@ -45,10 +45,8 @@ mod sdp_zone; pub use crate::sdp_zone::*; // Re-export all the traits in a prelude module, so that applications -// can always "use gst::prelude::*" without getting conflicts +// can always "use gst_sdp::prelude::*" without getting conflicts pub mod prelude { - #[doc(hidden)] - pub use glib::prelude::*; #[doc(hidden)] pub use gst::prelude::*; diff --git a/gstreamer-video/src/lib.rs b/gstreamer-video/src/lib.rs index 5a29c912b..8849d9fd6 100644 --- a/gstreamer-video/src/lib.rs +++ b/gstreamer-video/src/lib.rs @@ -103,12 +103,8 @@ pub const VIDEO_ENCODER_FLOW_NEED_DATA: gst::FlowSuccess = gst::FlowSuccess::Cus pub const VIDEO_DECODER_FLOW_NEED_DATA: gst::FlowSuccess = gst::FlowSuccess::CustomSuccess; // Re-export all the traits in a prelude module, so that applications -// can always "use gst::prelude::*" without getting conflicts +// can always "use gst_video::prelude::*" without getting conflicts pub mod prelude { - #[doc(hidden)] - pub use glib::prelude::*; - #[doc(hidden)] - pub use gst::prelude::*; #[doc(hidden)] pub use gst_base::prelude::*; diff --git a/gstreamer-video/src/subclass/mod.rs b/gstreamer-video/src/subclass/mod.rs index b4899ea41..2d903e535 100644 --- a/gstreamer-video/src/subclass/mod.rs +++ b/gstreamer-video/src/subclass/mod.rs @@ -7,10 +7,6 @@ mod video_encoder; mod video_sink; pub mod prelude { - #[doc(hidden)] - pub use glib::subclass::prelude::*; - #[doc(hidden)] - pub use gst::subclass::prelude::*; #[doc(hidden)] pub use gst_base::subclass::prelude::*; diff --git a/gstreamer-webrtc/src/lib.rs b/gstreamer-webrtc/src/lib.rs index 454e916f6..4ee10c210 100644 --- a/gstreamer-webrtc/src/lib.rs +++ b/gstreamer-webrtc/src/lib.rs @@ -31,12 +31,8 @@ mod web_rtc_data_channel; mod web_rtc_session_description; // Re-export all the traits in a prelude module, so that applications -// can always "use gst::prelude::*" without getting conflicts +// can always "use gst_webrtc::prelude::*" without getting conflicts pub mod prelude { - #[doc(hidden)] - pub use glib::prelude::*; - #[doc(hidden)] - pub use gst::prelude::*; #[doc(hidden)] pub use gst_sdp::prelude::*;