From 52509b4b95f49ac9b72c0a871962275ea5f6c2e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 9 Sep 2019 10:40:54 +0300 Subject: [PATCH] Remove subclassing feature and make it the default --- .gitlab-ci.yml | 8 ++++---- examples/Cargo.toml | 2 +- gstreamer-base/Cargo.toml | 1 - gstreamer-base/src/base_parse_frame.rs | 1 - gstreamer-base/src/lib.rs | 3 +-- gstreamer-video/Cargo.toml | 1 - gstreamer-video/src/lib.rs | 1 - gstreamer/Cargo.toml | 3 +-- gstreamer/src/lib.rs | 2 -- 9 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02da7f2bf..c63dd95fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,9 +51,9 @@ stages: for crate in gstreamer*; do if [ -n "$ALL_FEATURES" ]; then if [ $crate = "gstreamer" ]; then - FEATURES=subclassing,futures,ser_de,v1_16 + FEATURES=futures,ser_de,v1_16 elif [ $crate = "gstreamer-base" -o $crate = "gstreamer-video" ]; then - FEATURES=subclassing,v1_16 + FEATURES=v1_16 elif [ $crate = "gstreamer-gl" ]; then FEATURES=egl,x11,wayland,v1_16 else @@ -131,9 +131,9 @@ clippy: - | for crate in gstreamer*; do if [ $crate = "gstreamer" ]; then - FEATURES=subclassing,futures,ser_de,v1_16 + FEATURES=futures,ser_de,v1_16 elif [ $crate = "gstreamer-base" -o $crate = "gstreamer-video" ]; then - FEATURES=subclassing,v1_16 + FEATURES=v1_16 elif [ $crate = "gstreamer-gl" ]; then FEATURES=egl,x11,wayland,v1_16 else diff --git a/examples/Cargo.toml b/examples/Cargo.toml index fc22ac159..6fb2fa18d 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -4,7 +4,7 @@ version = "0.15.0" authors = ["Sebastian Dröge "] [dependencies] -glib = { git = "https://github.com/gtk-rs/glib", features = ["subclassing"] } +glib = { git = "https://github.com/gtk-rs/glib" } gstreamer = { path = "../gstreamer" } gstreamer-gl = { path = "../gstreamer-gl", optional = true } gstreamer-app = { path = "../gstreamer-app" } diff --git a/gstreamer-base/Cargo.toml b/gstreamer-base/Cargo.toml index 5fbe705fe..f1ddab390 100644 --- a/gstreamer-base/Cargo.toml +++ b/gstreamer-base/Cargo.toml @@ -35,7 +35,6 @@ v1_16 = ["gstreamer/v1_16", "gstreamer-base-sys/v1_16", "v1_14_1"] embed-lgpl-docs = ["rustdoc-stripper"] purge-lgpl-docs = ["rustdoc-stripper"] dox = ["gstreamer-base-sys/dox", "glib/dox", "gstreamer/dox"] -subclassing = ["gstreamer/subclassing"] ["package.metadata.docs.rs"] features = ["dox", "embed-lgpl-docs", "v1_16"] diff --git a/gstreamer-base/src/base_parse_frame.rs b/gstreamer-base/src/base_parse_frame.rs index 7cb3ae668..49fd7781f 100644 --- a/gstreamer-base/src/base_parse_frame.rs +++ b/gstreamer-base/src/base_parse_frame.rs @@ -87,7 +87,6 @@ impl<'a> fmt::Debug for BaseParseFrame<'a> { } impl<'a> BaseParseFrame<'a> { - #[cfg(feature = "subclassing")] pub(crate) unsafe fn new( frame: *mut gst_base_sys::GstBaseParseFrame, _parse: &'a BaseParse, diff --git a/gstreamer-base/src/lib.rs b/gstreamer-base/src/lib.rs index f60368c8b..38890feee 100644 --- a/gstreamer-base/src/lib.rs +++ b/gstreamer-base/src/lib.rs @@ -8,7 +8,7 @@ extern crate glib_sys; extern crate gobject_sys; -#[cfg_attr(feature = "subclassing", macro_use)] +#[macro_use] extern crate gstreamer as gst; extern crate gstreamer_base_sys as gst_base_sys; extern crate gstreamer_sys as gst_sys; @@ -85,5 +85,4 @@ pub mod prelude { mod utils; -#[cfg(feature = "subclassing")] pub mod subclass; diff --git a/gstreamer-video/Cargo.toml b/gstreamer-video/Cargo.toml index d3c23e6ff..fc535f240 100644 --- a/gstreamer-video/Cargo.toml +++ b/gstreamer-video/Cargo.toml @@ -37,7 +37,6 @@ v1_16 = ["gstreamer/v1_16", "gstreamer-base/v1_16", "gstreamer-video-sys/v1_16", embed-lgpl-docs = ["rustdoc-stripper"] purge-lgpl-docs = ["rustdoc-stripper"] dox = ["gstreamer-video-sys/dox", "glib/dox", "gstreamer/dox"] -subclassing = ["gstreamer/subclassing"] ["package.metadata.docs.rs"] features = ["dox", "embed-lgpl-docs", "v1_16"] diff --git a/gstreamer-video/src/lib.rs b/gstreamer-video/src/lib.rs index b9d55732e..cb83fbb16 100644 --- a/gstreamer-video/src/lib.rs +++ b/gstreamer-video/src/lib.rs @@ -103,5 +103,4 @@ pub mod prelude { pub use video_overlay::VideoOverlayExtManual; } -#[cfg(feature = "subclassing")] pub mod subclass; diff --git a/gstreamer/Cargo.toml b/gstreamer/Cargo.toml index d885bc102..b73109d03 100644 --- a/gstreamer/Cargo.toml +++ b/gstreamer/Cargo.toml @@ -27,7 +27,7 @@ muldiv = "0.2" serde = { version = "1.0", optional = true } serde_bytes = { version = "0.11", optional = true } serde_derive = { version = "1.0", optional = true } -paste = { version = "0.1", optional = true } +paste = { version = "0.1" } [build-dependencies] rustdoc-stripper = { version = "0.1", optional = true } @@ -47,7 +47,6 @@ purge-lgpl-docs = ["rustdoc-stripper"] dox = ["gstreamer-sys/dox", "glib/dox", "futures", "ser_de"] futures = ["futures-core-preview"] ser_de = ["num-rational/serde", "serde", "serde_bytes", "serde_derive"] -subclassing = ["glib/subclassing", "paste"] ["package.metadata.docs.rs"] features = ["dox", "embed-lgpl-docs", "v1_16"] diff --git a/gstreamer/src/lib.rs b/gstreamer/src/lib.rs index 62648329f..ac0411fdd 100644 --- a/gstreamer/src/lib.rs +++ b/gstreamer/src/lib.rs @@ -24,7 +24,6 @@ pub extern crate gobject_sys; #[doc(hidden)] pub extern crate gstreamer_sys as gst_sys; #[doc(hidden)] -#[cfg(feature = "subclassing")] pub extern crate paste; #[macro_use] @@ -365,5 +364,4 @@ pub mod prelude { mod utils; #[macro_use] -#[cfg(feature = "subclassing")] pub mod subclass;