From 069c6a2c01ff316390640d3ca6ed79f0a2eb21a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Laignel?= Date: Mon, 12 Sep 2022 18:32:16 +0200 Subject: [PATCH] Rename feature 'ser_de' as 'serde' When I introduced the 'ser_de' feature, I couldn't find a way to name it 'serde' while also make it pull the optional 'serde' crate together with the other related dependencies. With rustc >= 1.60 we can use 'dep:serde' to refer to the 'serde' dependency as part of the 'serde' feature. --- .gitlab-ci.yml | 4 ++-- ci/run_windows_tests.ps1 | 2 +- gstreamer-audio/Cargo.toml | 4 ++-- gstreamer-audio/src/lib.rs | 2 +- gstreamer-editing-services/Cargo.toml | 4 ++-- gstreamer-editing-services/src/lib.rs | 2 +- gstreamer-gl/Cargo.toml | 4 ++-- gstreamer-gl/src/lib.rs | 2 +- gstreamer-pbutils/Cargo.toml | 4 ++-- gstreamer-pbutils/src/lib.rs | 2 +- gstreamer-rtp/Cargo.toml | 4 ++-- gstreamer-rtp/src/lib.rs | 2 +- gstreamer-rtsp-server/Cargo.toml | 4 ++-- gstreamer-rtsp-server/src/lib.rs | 2 +- gstreamer-rtsp/Cargo.toml | 4 ++-- gstreamer-rtsp/src/lib.rs | 2 +- gstreamer-video/Cargo.toml | 4 ++-- gstreamer-video/Gir.toml | 2 +- gstreamer-video/src/lib.rs | 2 +- gstreamer-video/src/video_event.rs | 6 ++--- gstreamer/Cargo.toml | 6 ++--- gstreamer/Gir.toml | 20 ++++++++--------- gstreamer/src/date_time_serde.rs | 2 +- gstreamer/src/format.rs | 2 +- gstreamer/src/format_serde.rs | 8 +++---- gstreamer/src/lib.rs | 32 +++++++++++++-------------- gstreamer/src/value.rs | 6 ++--- 27 files changed, 69 insertions(+), 69 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 184f626f7..cbdd796d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -232,7 +232,7 @@ plugins-update-nightly: crate=$1 case "$crate" in gstreamer-audio|gstreamer-editing-services|gstreamer-gl|gstreamer-pbutils|gstreamer-rtp|gstreamer-rtsp|gstreamer-video|gstreamer) - echo "--features=ser_de,v1_22" + echo "--features=serde,v1_22" ;; gstreamer-validate) echo "" @@ -428,7 +428,7 @@ clippy: crate=$1 case "$crate" in gstreamer-audio|gstreamer-editing-services|gstreamer-gl|gstreamer-pbutils|gstreamer-rtp|gstreamer-rtsp|gstreamer-video|gstreamer) - echo "--features=ser_de,v1_22" + echo "--features=serde,v1_22" ;; gstreamer-validate) echo "" diff --git a/ci/run_windows_tests.ps1 b/ci/run_windows_tests.ps1 index fbb3379b8..7c7d7d9ce 100644 --- a/ci/run_windows_tests.ps1 +++ b/ci/run_windows_tests.ps1 @@ -45,7 +45,7 @@ foreach($crate in $crates) # Or when we want to build without default features if ($env:LocalFeatures -and ($env:LocalFeatures -ne '--no-default-features')) { if ($crate -eq 'gstreamer') { - $env:LocalFeatures += "ser_de," + $env:LocalFeatures += "serde," } if ($crate -eq 'examples') { diff --git a/gstreamer-audio/Cargo.toml b/gstreamer-audio/Cargo.toml index b56f5d571..c211371cc 100644 --- a/gstreamer-audio/Cargo.toml +++ b/gstreamer-audio/Cargo.toml @@ -35,8 +35,8 @@ v1_16 = ["gst/v1_16", "gst-base/v1_16", "ffi/v1_16"] v1_18 = ["gst/v1_18", "gst-base/v1_18", "ffi/v1_18", "v1_16"] v1_20 = ["gst/v1_20", "gst-base/v1_20", "ffi/v1_20", "v1_18"] v1_22 = ["gst/v1_22", "gst-base/v1_22", "ffi/v1_22", "v1_20"] -dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-base/dox", "ser_de"] -ser_de = ["serde", "gst/ser_de"] +dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-base/dox", "serde"] +serde = ["dep:serde", "gst/serde"] [package.metadata.docs.rs] features = ["dox"] diff --git a/gstreamer-audio/src/lib.rs b/gstreamer-audio/src/lib.rs index 152d698a9..7fbaf807d 100644 --- a/gstreamer-audio/src/lib.rs +++ b/gstreamer-audio/src/lib.rs @@ -39,7 +39,7 @@ pub use crate::auto::*; mod caps; pub use crate::caps::AudioCapsBuilder; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod flag_serde; mod audio_format; diff --git a/gstreamer-editing-services/Cargo.toml b/gstreamer-editing-services/Cargo.toml index 244a65500..c25bd91c6 100644 --- a/gstreamer-editing-services/Cargo.toml +++ b/gstreamer-editing-services/Cargo.toml @@ -33,8 +33,8 @@ v1_16 = ["gst/v1_16", "gst-base/v1_16", "gst-pbutils/v1_16", "ffi/v1_16"] v1_18 = ["gst/v1_18", "gst-base/v1_18", "gst-pbutils/v1_18", "ffi/v1_18", "v1_16"] v1_20 = ["gst/v1_20", "gst-base/v1_20", "gst-pbutils/v1_20", "ffi/v1_20", "v1_18"] v1_22 = ["gst/v1_22", "gst-base/v1_22", "gst-pbutils/v1_22", "ffi/v1_22", "v1_20"] -dox = ["v1_22", "ffi/dox", "glib/dox", "gio/dox", "gst/dox", "gst-base/dox", "gst-pbutils/dox", "ser_de"] -ser_de = ["serde", "gst/ser_de", "gst-pbutils/ser_de"] +dox = ["v1_22", "ffi/dox", "glib/dox", "gio/dox", "gst/dox", "gst-base/dox", "gst-pbutils/dox", "serde"] +serde = ["dep:serde", "gst/serde", "gst-pbutils/serde"] [package.metadata.docs.rs] features = ["dox"] diff --git a/gstreamer-editing-services/src/lib.rs b/gstreamer-editing-services/src/lib.rs index 08c1e53e7..9cf0c9a1f 100644 --- a/gstreamer-editing-services/src/lib.rs +++ b/gstreamer-editing-services/src/lib.rs @@ -67,7 +67,7 @@ macro_rules! skip_assert_initialized { mod auto; pub use crate::auto::*; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod flag_serde; // Re-export all the traits in a prelude module, so that applications diff --git a/gstreamer-gl/Cargo.toml b/gstreamer-gl/Cargo.toml index 6f2fe2bc5..fd1a5cf4e 100644 --- a/gstreamer-gl/Cargo.toml +++ b/gstreamer-gl/Cargo.toml @@ -38,8 +38,8 @@ v1_16 = ["gst/v1_16", "gst-base/v1_16", "gst-video/v1_16", "ffi/v1_16"] v1_18 = ["gst/v1_18", "gst-base/v1_18", "gst-video/v1_18", "ffi/v1_18", "v1_16"] v1_20 = ["gst/v1_20", "gst-base/v1_20", "gst-video/v1_20", "ffi/v1_20", "v1_18"] v1_22 = ["gst/v1_22", "gst-base/v1_22", "gst-video/v1_22", "ffi/v1_22", "v1_20"] -dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-base/dox", "gst-video/dox", "ser_de"] -ser_de = ["serde", "gst/ser_de", "gst-video/ser_de"] +dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-base/dox", "gst-video/dox", "serde"] +serde = ["dep:serde", "gst/serde", "gst-video/serde"] [package.metadata.docs.rs] features = ["dox"] diff --git a/gstreamer-gl/src/lib.rs b/gstreamer-gl/src/lib.rs index cf6b5f679..0d067acc7 100644 --- a/gstreamer-gl/src/lib.rs +++ b/gstreamer-gl/src/lib.rs @@ -37,7 +37,7 @@ mod auto; pub use crate::auto::functions::*; pub use crate::auto::*; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod flag_serde; mod caps_features; diff --git a/gstreamer-pbutils/Cargo.toml b/gstreamer-pbutils/Cargo.toml index 0b96c0ee2..9d8d4f647 100644 --- a/gstreamer-pbutils/Cargo.toml +++ b/gstreamer-pbutils/Cargo.toml @@ -34,8 +34,8 @@ v1_16 = ["gst/v1_16", "ffi/v1_16"] v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"] v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"] v1_22 = ["gst/v1_22", "ffi/v1_22", "v1_20"] -dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "ser_de"] -ser_de = ["serde", "gst/ser_de"] +dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "serde"] +serde = ["dep:serde", "gst/serde"] [package.metadata.docs.rs] features = ["dox"] diff --git a/gstreamer-pbutils/src/lib.rs b/gstreamer-pbutils/src/lib.rs index 4294611cb..344553767 100644 --- a/gstreamer-pbutils/src/lib.rs +++ b/gstreamer-pbutils/src/lib.rs @@ -43,7 +43,7 @@ mod auto; pub use crate::auto::functions::*; pub use crate::auto::*; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod flag_serde; mod discoverer; diff --git a/gstreamer-rtp/Cargo.toml b/gstreamer-rtp/Cargo.toml index 1d64018aa..2231b960c 100644 --- a/gstreamer-rtp/Cargo.toml +++ b/gstreamer-rtp/Cargo.toml @@ -32,8 +32,8 @@ v1_16 = ["gst/v1_16", "ffi/v1_16"] v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"] v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"] v1_22 = ["gst/v1_22", "ffi/v1_22", "v1_20"] -dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "ser_de"] -ser_de = ["serde", "gst/ser_de"] +dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "serde"] +serde = ["dep:serde", "gst/serde"] [package.metadata.docs.rs] features = ["dox"] diff --git a/gstreamer-rtp/src/lib.rs b/gstreamer-rtp/src/lib.rs index 8ab15a976..568a073af 100644 --- a/gstreamer-rtp/src/lib.rs +++ b/gstreamer-rtp/src/lib.rs @@ -37,7 +37,7 @@ mod auto; pub use crate::auto::functions::*; pub use crate::auto::*; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod flag_serde; pub mod subclass; diff --git a/gstreamer-rtsp-server/Cargo.toml b/gstreamer-rtsp-server/Cargo.toml index 9105a5da3..7b40e0cb0 100644 --- a/gstreamer-rtsp-server/Cargo.toml +++ b/gstreamer-rtsp-server/Cargo.toml @@ -36,8 +36,8 @@ v1_16 = ["gst/v1_16", "gst-sdp/v1_16", "gst-rtsp/v1_16", "gst-net/v1_16", "ffi/v v1_18 = ["gst/v1_18", "gst-sdp/v1_18", "gst-rtsp/v1_18", "gst-net/v1_18", "ffi/v1_18", "v1_16"] v1_20 = ["gst/v1_20", "gst-sdp/v1_20", "gst-rtsp/v1_20", "gst-net/v1_20", "ffi/v1_20", "v1_18"] v1_22 = ["gst/v1_22", "gst-sdp/v1_22", "gst-rtsp/v1_22", "gst-net/v1_22", "ffi/v1_22", "v1_20"] -dox = ["v1_22", "ffi/dox", "glib/dox", "gio/dox", "gst/dox", "gst-sdp/dox", "gst-rtsp/dox", "gst-net/dox", "ser_de"] -ser_de = ["serde", "gst/ser_de", "gst-rtsp/ser_de"] +dox = ["v1_22", "ffi/dox", "glib/dox", "gio/dox", "gst/dox", "gst-sdp/dox", "gst-rtsp/dox", "gst-net/dox", "serde"] +serde = ["dep:serde", "gst/serde", "gst-rtsp/serde"] [package.metadata.docs.rs] features = ["dox"] diff --git a/gstreamer-rtsp-server/src/lib.rs b/gstreamer-rtsp-server/src/lib.rs index 90c2d8f6a..8eed4b925 100644 --- a/gstreamer-rtsp-server/src/lib.rs +++ b/gstreamer-rtsp-server/src/lib.rs @@ -40,7 +40,7 @@ macro_rules! skip_assert_initialized { mod auto; pub use crate::auto::*; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod flag_serde; mod rtsp_address_pool; diff --git a/gstreamer-rtsp/Cargo.toml b/gstreamer-rtsp/Cargo.toml index 67b321806..3136601ad 100644 --- a/gstreamer-rtsp/Cargo.toml +++ b/gstreamer-rtsp/Cargo.toml @@ -32,8 +32,8 @@ v1_16 = ["gst/v1_16", "gst-sdp/v1_16", "ffi/v1_16"] v1_18 = ["gst/v1_18", "gst-sdp/v1_18", "ffi/v1_18", "v1_16"] v1_20 = ["gst/v1_20", "gst-sdp/v1_20", "ffi/v1_20", "v1_18"] v1_22 = ["gst/v1_22", "gst-sdp/v1_22", "ffi/v1_22", "v1_20"] -dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-sdp/dox", "ser_de"] -ser_de = ["serde", "gst/ser_de"] +dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-sdp/dox", "serde"] +serde = ["dep:serde", "gst/serde"] [package.metadata.docs.rs] features = ["dox"] diff --git a/gstreamer-rtsp/src/lib.rs b/gstreamer-rtsp/src/lib.rs index 3ec70625d..7c9d3e2b8 100644 --- a/gstreamer-rtsp/src/lib.rs +++ b/gstreamer-rtsp/src/lib.rs @@ -34,7 +34,7 @@ macro_rules! skip_assert_initialized { mod auto; pub use crate::auto::*; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod flag_serde; // Re-export all the traits in a prelude module, so that applications diff --git a/gstreamer-video/Cargo.toml b/gstreamer-video/Cargo.toml index 8fedd1611..4b315b2d0 100644 --- a/gstreamer-video/Cargo.toml +++ b/gstreamer-video/Cargo.toml @@ -36,8 +36,8 @@ v1_16 = ["gst/v1_16", "gst-base/v1_16", "ffi/v1_16"] v1_18 = ["gst/v1_18", "gst-base/v1_18", "ffi/v1_18", "v1_16"] v1_20 = ["gst/v1_20", "gst-base/v1_20", "ffi/v1_20", "v1_18"] v1_22 = ["gst/v1_22", "gst-base/v1_22", "ffi/v1_22", "v1_20"] -dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-base/dox", "ser_de"] -ser_de = ["serde", "gst/ser_de"] +dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-base/dox", "serde"] +serde = ["dep:serde", "gst/serde"] [package.metadata.docs.rs] features = ["dox"] diff --git a/gstreamer-video/Gir.toml b/gstreamer-video/Gir.toml index 36e2db69e..e3ed5690f 100644 --- a/gstreamer-video/Gir.toml +++ b/gstreamer-video/Gir.toml @@ -287,7 +287,7 @@ name = "GstVideo.NavigationCommand" status = "generate" [[object.derive]] name = "serde::Serialize, serde::Deserialize" - cfg_condition = "feature = \"ser_de\"" + cfg_condition = "feature = \"serde\"" [[object.derive]] name = "Debug, Eq, PartialEq, Ord, PartialOrd, Hash" diff --git a/gstreamer-video/src/lib.rs b/gstreamer-video/src/lib.rs index a943ecb23..dd9492cb9 100644 --- a/gstreamer-video/src/lib.rs +++ b/gstreamer-video/src/lib.rs @@ -36,7 +36,7 @@ macro_rules! skip_assert_initialized { mod auto; pub use crate::auto::*; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod flag_serde; mod navigation; diff --git a/gstreamer-video/src/video_event.rs b/gstreamer-video/src/video_event.rs index 6aa1da197..17bef391d 100644 --- a/gstreamer-video/src/video_event.rs +++ b/gstreamer-video/src/video_event.rs @@ -601,8 +601,8 @@ nav_event_builder!( ); const NAVIGATION_EVENT_NAME: &str = "application/x-gst-navigation"; -#[cfg_attr(feature = "ser_de", derive(serde::Serialize, serde::Deserialize))] -#[cfg_attr(feature = "ser_de", serde(tag = "event"))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "serde", serde(tag = "event"))] #[derive(Clone, PartialEq, Debug)] pub enum NavigationEvent { KeyPress { @@ -1266,7 +1266,7 @@ impl NavigationEvent { #[cfg(test)] mod tests { #[test] - #[cfg(feature = "ser_de")] + #[cfg(feature = "serde")] #[cfg(any(feature = "v1_22", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_22")))] fn serialize_navigation_events() { diff --git a/gstreamer/Cargo.toml b/gstreamer/Cargo.toml index 2929c40c6..f288a9b46 100644 --- a/gstreamer/Cargo.toml +++ b/gstreamer/Cargo.toml @@ -27,7 +27,7 @@ futures-channel = "0.3" futures-util = { version = "0.3", default-features = false } muldiv = "1" opt-ops = { package = "option-operations", version = "0.5" } -serde = { version = "1.0", optional = true } +serde = { version = "1.0", optional = true, features = ["derive"] } serde_bytes = { version = "0.11", optional = true } paste = "1.0" pretty-hex = "0.3" @@ -45,8 +45,8 @@ v1_16 = ["ffi/v1_16"] v1_18 = ["ffi/v1_18", "v1_16"] v1_20 = ["ffi/v1_20", "v1_18"] v1_22 = ["ffi/v1_22", "v1_20"] -dox = ["v1_22", "ffi/dox", "glib/dox", "ser_de"] -ser_de = ["num-rational/serde", "serde", "serde_bytes", "serde/derive"] +dox = ["v1_22", "ffi/dox", "glib/dox", "serde"] +serde = ["num-rational/serde", "dep:serde", "serde_bytes"] [package.metadata.docs.rs] features = ["dox"] diff --git a/gstreamer/Gir.toml b/gstreamer/Gir.toml index ee8b77aa5..1a66f9cf3 100644 --- a/gstreamer/Gir.toml +++ b/gstreamer/Gir.toml @@ -1387,7 +1387,7 @@ name = "Gst.Format" status = "generate" [[object.derive]] name = "serde::Serialize, serde::Deserialize" - cfg_condition = "feature = \"ser_de\"" + cfg_condition = "feature = \"serde\"" [[object.derive]] name = "Debug, PartialEq, Eq, PartialOrd, Ord, Hash" [[object.function]] @@ -1748,7 +1748,7 @@ name = "Gst.PadDirection" status = "generate" [[object.derive]] name = "serde::Serialize, serde::Deserialize" - cfg_condition = "feature = \"ser_de\"" + cfg_condition = "feature = \"serde\"" [[object.derive]] name = "Debug, PartialEq, Eq, PartialOrd, Ord, Hash" @@ -1780,7 +1780,7 @@ name = "Gst.PadPresence" status = "generate" [[object.derive]] name = "serde::Serialize, serde::Deserialize" - cfg_condition = "feature = \"ser_de\"" + cfg_condition = "feature = \"serde\"" [[object.derive]] name = "Debug, PartialEq, Eq, PartialOrd, Ord, Hash" @@ -2032,7 +2032,7 @@ name = "Gst.Rank" status = "generate" [[object.derive]] name = "serde::Serialize, serde::Deserialize" - cfg_condition = "feature = \"ser_de\"" + cfg_condition = "feature = \"serde\"" [[object.derive]] name = "Debug" @@ -2132,7 +2132,7 @@ name = "Gst.State" status = "generate" [[object.derive]] name = "serde::Serialize, serde::Deserialize" - cfg_condition = "feature = \"ser_de\"" + cfg_condition = "feature = \"serde\"" [[object.derive]] name = "Debug, PartialEq, Eq, PartialOrd, Ord, Hash" @@ -2313,7 +2313,7 @@ name = "Gst.TagScope" status = "generate" [[object.derive]] name = "serde::Serialize, serde::Deserialize" - cfg_condition = "feature = \"ser_de\"" + cfg_condition = "feature = \"serde\"" [[object.derive]] name = "Debug, PartialEq, Eq, PartialOrd, Ord, Hash" @@ -2408,7 +2408,7 @@ name = "Gst.TocEntryType" status = "generate" [[object.derive]] name = "serde::Serialize, serde::Deserialize" - cfg_condition = "feature = \"ser_de\"" + cfg_condition = "feature = \"serde\"" [[object.derive]] name = "Debug, PartialEq, Eq, PartialOrd, Ord, Hash" @@ -2417,7 +2417,7 @@ name = "Gst.TocLoopType" status = "generate" [[object.derive]] name = "serde::Serialize, serde::Deserialize" - cfg_condition = "feature = \"ser_de\"" + cfg_condition = "feature = \"serde\"" [[object.derive]] name = "Debug, PartialEq, Eq, PartialOrd, Ord, Hash" @@ -2426,7 +2426,7 @@ name = "Gst.TocScope" status = "generate" [[object.derive]] name = "serde::Serialize, serde::Deserialize" - cfg_condition = "feature = \"ser_de\"" + cfg_condition = "feature = \"serde\"" [[object.derive]] name = "Debug, PartialEq, Eq, PartialOrd, Ord, Hash" @@ -2475,6 +2475,6 @@ name = "Gst.URIType" status = "generate" [[object.derive]] name = "serde::Serialize, serde::Deserialize" - cfg_condition = "feature = \"ser_de\"" + cfg_condition = "feature = \"serde\"" [[object.derive]] name = "Debug, PartialEq, Eq, PartialOrd, Ord, Hash" diff --git a/gstreamer/src/date_time_serde.rs b/gstreamer/src/date_time_serde.rs index 2a2574237..5b8b8f4ac 100644 --- a/gstreamer/src/date_time_serde.rs +++ b/gstreamer/src/date_time_serde.rs @@ -21,7 +21,7 @@ enum DateTimeVariants { } // Note: ser / de for `glib::Date` should be implemented in the `glib` crate -// However, there is no `ser_de` feature in `glib` right now. The limitation is that +// However, there is no `serde` feature in `glib` right now. The limitation is that // `Date` fields can only be ser / de when they are used in `Value`s (which implies // `Array`s, `List`s, `Structure` fields and `Tag`s) pub(crate) struct Date(glib::Date); diff --git a/gstreamer/src/format.rs b/gstreamer/src/format.rs index 8f4a5cd0e..e8b215f0e 100644 --- a/gstreamer/src/format.rs +++ b/gstreamer/src/format.rs @@ -88,7 +88,7 @@ impl Signed { } #[derive(PartialEq, Eq, Hash, Clone, Copy, Debug)] -#[cfg_attr(feature = "ser_de", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub enum GenericFormattedValue { Undefined(Undefined), Default(Option), diff --git a/gstreamer/src/format_serde.rs b/gstreamer/src/format_serde.rs index 931797077..85a132e12 100644 --- a/gstreamer/src/format_serde.rs +++ b/gstreamer/src/format_serde.rs @@ -7,7 +7,7 @@ use crate::format::{Buffers, Bytes, Default, Percent, Undefined}; // Manual implementation for some types that would otherwise yield representations such as: // "Default((Some(42)))" -macro_rules! impl_ser_de( +macro_rules! impl_serde( ($t:ident) => { impl Serialize for $t { fn serialize(&self, serializer: S) -> Result { @@ -25,9 +25,9 @@ macro_rules! impl_ser_de( } ); -impl_ser_de!(Buffers); -impl_ser_de!(Bytes); -impl_ser_de!(Default); +impl_serde!(Buffers); +impl_serde!(Bytes); +impl_serde!(Default); impl Serialize for Undefined { fn serialize(&self, serializer: S) -> Result { diff --git a/gstreamer/src/lib.rs b/gstreamer/src/lib.rs index 10c2a8666..2e32be9c1 100644 --- a/gstreamer/src/lib.rs +++ b/gstreamer/src/lib.rs @@ -50,9 +50,9 @@ pub use crate::auto::*; mod macros; #[macro_use] -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod serde_macros; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] pub use crate::serde_macros::*; #[macro_use] @@ -73,28 +73,28 @@ mod value; pub use crate::value::{ Array, ArrayRef, Bitmask, Fraction, FractionRange, IntRange, List, ListRef, }; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] #[macro_use] mod value_serde; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod flag_serde; pub mod structure; pub use crate::structure::{Structure, StructureRef}; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod structure_serde; pub mod caps; pub use crate::caps::{Caps, CapsFilterMapAction, CapsRef}; mod caps_features; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod caps_serde; pub use crate::caps_features::{ CapsFeatures, CapsFeaturesRef, CAPS_FEATURES_MEMORY_SYSTEM_MEMORY, CAPS_FEATURE_MEMORY_SYSTEM_MEMORY, }; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod caps_features_serde; pub mod tags; @@ -102,7 +102,7 @@ pub use crate::tags::{ tag_exists, tag_get_description, tag_get_flag, tag_get_nick, tag_get_type, Tag, TagList, TagListRef, }; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod tags_serde; pub mod meta; @@ -119,17 +119,17 @@ mod buffer_cursor; pub use crate::buffer_cursor::{BufferCursor, BufferRefCursor}; pub mod memory; pub use crate::memory::{MappedMemory, Memory, MemoryMap, MemoryRef}; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod buffer_serde; pub mod sample; pub use crate::sample::{Sample, SampleRef}; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod sample_serde; pub mod bufferlist; pub use crate::bufferlist::{BufferList, BufferListRef}; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod bufferlist_serde; pub mod query; @@ -171,10 +171,10 @@ mod bus_windows; mod child_proxy; mod clock_time; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod clock_time_serde; mod date_time; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod date_time_serde; mod device_monitor; mod device_provider; @@ -230,17 +230,17 @@ pub use crate::format::{ GenericFormattedValue, Signed, SpecificFormattedValue, SpecificFormattedValueFullRange, SpecificFormattedValueIntrinsic, }; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod format_serde; mod segment; pub use crate::segment::*; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod segment_serde; pub mod toc; pub use crate::toc::{Toc, TocEntry, TocEntryRef, TocRef}; -#[cfg(feature = "ser_de")] +#[cfg(feature = "serde")] mod toc_serde; mod clock; diff --git a/gstreamer/src/value.rs b/gstreamer/src/value.rs index 952feb311..01d20f41d 100644 --- a/gstreamer/src/value.rs +++ b/gstreamer/src/value.rs @@ -282,7 +282,7 @@ impl glib::value::ToValue for Fraction { } #[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)] -#[cfg_attr(feature = "ser_de", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct IntRange { min: T, max: T, @@ -466,7 +466,7 @@ impl glib::value::ToValue for IntRange { } #[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)] -#[cfg_attr(feature = "ser_de", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct FractionRange { min: Fraction, max: Fraction, @@ -549,7 +549,7 @@ impl glib::value::ToValue for FractionRange { } #[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)] -#[cfg_attr(feature = "ser_de", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct Bitmask(pub u64); impl Bitmask {