serde feature added

Support for serde derivations in no_std. Part of: paritytech/substrate#12994
paritytech · Apr 28, 2023 · 2ffb9b8 · 2ffb9b8
1 parent 910097e
commit 2ffb9b8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/bounded-collections/Cargo.toml b/bounded-collections/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bounded-collections"
-version = "0.1.5"
+version = "0.1.6"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/paritytech/parity-common"
@@ -9,7 +9,7 @@ edition = "2021"
 rust-version = "1.60.0"
 
 [dependencies]
-serde = { version = "1.0.101", default-features = false, optional = true }
+serde = { version = "1.0.101", default-features = false, optional = true, features=["alloc", "derive"] }
 codec = { version = "3.3.0", default-features = false, features = ["max-encoded-len"], package = "parity-scale-codec" }
 scale-info = { version = ">=1.0, <3", features = ["derive"], default-features = false }
 log = { version = "0.4.17", default-features = false }
@@ -19,10 +19,12 @@ serde_json = "1.0.41"
 
 [features]
 default = ["std"]
+serde = [
+    "dep:serde"
+]
 std = [
     "log/std",
     "codec/std",
     "scale-info/std",
-    "serde",
-    "serde/derive",
+    "serde/std",
 ]
diff --git a/bounded-collections/src/bounded_vec.rs b/bounded-collections/src/bounded_vec.rs
@@ -27,7 +27,7 @@ use core::{
 	ops::{Deref, Index, IndexMut, RangeBounds},
 	slice::SliceIndex,
 };
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
 use serde::{
 	de::{Error, SeqAccess, Visitor},
 	Deserialize, Deserializer, Serialize,
@@ -40,18 +40,18 @@ use serde::{
 ///
 /// As the name suggests, the length of the queue is always bounded. All internal operations ensure
 /// this bound is respected.
-#[cfg_attr(feature = "std", derive(Serialize), serde(transparent))]
+#[cfg_attr(feature = "serde", derive(Serialize), serde(transparent))]
 #[derive(Encode, scale_info::TypeInfo)]
 #[scale_info(skip_type_params(S))]
-pub struct BoundedVec<T, S>(pub(super) Vec<T>, #[cfg_attr(feature = "std", serde(skip_serializing))] PhantomData<S>);
+pub struct BoundedVec<T, S>(pub(super) Vec<T>, #[cfg_attr(feature = "serde", serde(skip_serializing))] PhantomData<S>);
 
 /// Create an object through truncation.
 pub trait TruncateFrom<T> {
 	/// Create an object through truncation.
 	fn truncate_from(unbound: T) -> Self;
 }
 
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
 impl<'de, T, S: Get<u32>> Deserialize<'de> for BoundedVec<T, S>
 where
 	T: Deserialize<'de>,
@@ -68,7 +68,7 @@ where
 		{
 			type Value = Vec<T>;
 
-			fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+			fn expecting(&self, formatter: &mut alloc::fmt::Formatter) -> alloc::fmt::Result {
 				formatter.write_str("a sequence")
 			}
 

diff --git a/bounded-collections/src/weak_bounded_vec.rs b/bounded-collections/src/weak_bounded_vec.rs
@@ -27,7 +27,7 @@ use core::{
 	ops::{Deref, Index, IndexMut},
 	slice::SliceIndex,
 };
-#[cfg(feature = "std")]
+#[cfg(feature = "serde")]
 use serde::{
 	de::{Error, SeqAccess, Visitor},
 	Deserialize, Deserializer, Serialize,
@@ -40,7 +40,7 @@ use serde::{
 ///
 /// The length of the vec is not strictly bounded. Decoding a vec with more element that the bound
 /// is accepted, and some method allow to bypass the restriction with warnings.
-#[cfg_attr(feature = "std", derive(Serialize), serde(transparent))]
+#[cfg_attr(feature = "serde", derive(Serialize), serde(transparent))]
 #[derive(Encode, scale_info::TypeInfo)]
 #[scale_info(skip_type_params(S))]
 pub struct WeakBoundedVec<T, S>(
@@ -65,7 +65,7 @@ where
 		{
 			type Value = Vec<T>;
 
-			fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+			fn expecting(&self, formatter: &mut alloc::fmt::Formatter) -> alloc::fmt::Result {
 				formatter.write_str("a sequence")
 			}