Skip to content

pod!: Rename serde-traits feature to serde #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grod220 merged 2 commits into from
Feb 25, 2026
Merged

pod!: Rename serde-traits feature to serde #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e6da17
Rename serde-traits feature to serde
grod220 Feb 24, 2026
f8deaf3
add solana-address/decode to serde feature
grod220 Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pod/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "Apache-2.0"
edition = "2021"

[features]
serde-traits = ["dep:serde", "solana-address/decode"]
serde = ["dep:serde", "solana-address/decode"]
borsh = ["dep:borsh", "solana-address/borsh"]
wincode = ["dep:wincode"]

Expand Down
14 changes: 7 additions & 7 deletions pod/src/optional_keys.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use {
solana_program_error::ProgramError,
solana_program_option::COption,
};
#[cfg(feature = "serde-traits")]
#[cfg(feature = "serde")]
use {
core::{convert::TryFrom, fmt, str::FromStr},
serde::de::{Error, Unexpected, Visitor},
Expand Down Expand Up @@ -72,7 +72,7 @@ impl From<OptionalNonZeroPubkey> for COption<Address> {
}
}

#[cfg(feature = "serde-traits")]
#[cfg(feature = "serde")]
impl Serialize for OptionalNonZeroPubkey {
fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
where
Expand All @@ -86,11 +86,11 @@ impl Serialize for OptionalNonZeroPubkey {
}
}

#[cfg(feature = "serde-traits")]
#[cfg(feature = "serde")]
/// Visitor for deserializing `OptionalNonZeroPubkey`
struct OptionalNonZeroPubkeyVisitor;

#[cfg(feature = "serde-traits")]
#[cfg(feature = "serde")]
impl Visitor<'_> for OptionalNonZeroPubkeyVisitor {
type Value = OptionalNonZeroPubkey;

Expand All @@ -117,7 +117,7 @@ impl Visitor<'_> for OptionalNonZeroPubkeyVisitor {
}
}

#[cfg(feature = "serde-traits")]
#[cfg(feature = "serde")]
impl<'de> Deserialize<'de> for OptionalNonZeroPubkey {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
Expand Down Expand Up @@ -159,7 +159,7 @@ mod tests {
);
}

#[cfg(feature = "serde-traits")]
#[cfg(feature = "serde")]
#[test]
fn test_pod_non_zero_option_serde_some() {
let optional_non_zero_pubkey_some =
Expand All @@ -175,7 +175,7 @@ mod tests {
assert_eq!(optional_non_zero_pubkey_some, deserialized_some);
}

#[cfg(feature = "serde-traits")]
#[cfg(feature = "serde")]
#[test]
fn test_pod_non_zero_option_serde_none() {
let optional_non_zero_pubkey_none =
Expand Down
42 changes: 21 additions & 21 deletions pod/src/primitives.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
#[cfg(feature = "borsh")]
use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
use bytemuck_derive::{Pod, Zeroable};
#[cfg(feature = "serde-traits")]
#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
#[cfg(feature = "wincode")]
use wincode::{SchemaRead, SchemaWrite};

/// The standard `bool` is not a `Pod`, define a replacement that is
#[cfg_attr(feature = "wincode", derive(SchemaRead, SchemaWrite))]
#[cfg_attr(feature = "wincode", wincode(assert_zero_copy))]
#[cfg_attr(feature = "serde-traits", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde-traits", serde(from = "bool", into = "bool"))]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde", serde(from = "bool", into = "bool"))]
#[derive(Clone, Copy, Debug, Default, PartialEq, Pod, Zeroable)]
#[repr(transparent)]
pub struct PodBool(pub u8);
Expand Down Expand Up @@ -74,8 +74,8 @@ macro_rules! impl_int_conversion {
/// `u16` type that can be used in `Pod`s
#[cfg_attr(feature = "wincode", derive(SchemaRead, SchemaWrite))]
#[cfg_attr(feature = "wincode", wincode(assert_zero_copy))]
#[cfg_attr(feature = "serde-traits", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde-traits", serde(from = "u16", into = "u16"))]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde", serde(from = "u16", into = "u16"))]
#[derive(Clone, Copy, Debug, Default, PartialEq, Pod, Zeroable)]
#[repr(transparent)]
pub struct PodU16(pub [u8; 2]);
Expand All @@ -84,8 +84,8 @@ impl_int_conversion!(PodU16, u16);
/// `i16` type that can be used in Pods
#[cfg_attr(feature = "wincode", derive(SchemaRead, SchemaWrite))]
#[cfg_attr(feature = "wincode", wincode(assert_zero_copy))]
#[cfg_attr(feature = "serde-traits", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde-traits", serde(from = "i16", into = "i16"))]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde", serde(from = "i16", into = "i16"))]
#[derive(Clone, Copy, Debug, Default, PartialEq, Pod, Zeroable)]
#[repr(transparent)]
pub struct PodI16(pub [u8; 2]);
Expand All @@ -98,8 +98,8 @@ impl_int_conversion!(PodI16, i16);
feature = "borsh",
derive(BorshDeserialize, BorshSerialize, BorshSchema)
)]
#[cfg_attr(feature = "serde-traits", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde-traits", serde(from = "u32", into = "u32"))]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde", serde(from = "u32", into = "u32"))]
#[derive(Clone, Copy, Debug, Default, PartialEq, Pod, Zeroable)]
#[repr(transparent)]
pub struct PodU32(pub [u8; 4]);
Expand All @@ -112,8 +112,8 @@ impl_int_conversion!(PodU32, u32);
feature = "borsh",
derive(BorshDeserialize, BorshSerialize, BorshSchema)
)]
#[cfg_attr(feature = "serde-traits", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde-traits", serde(from = "u64", into = "u64"))]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde", serde(from = "u64", into = "u64"))]
#[derive(Clone, Copy, Debug, Default, PartialEq, Pod, Zeroable)]
#[repr(transparent)]
pub struct PodU64(pub [u8; 8]);
Expand All @@ -122,8 +122,8 @@ impl_int_conversion!(PodU64, u64);
/// `i64` type that can be used in Pods
#[cfg_attr(feature = "wincode", derive(SchemaRead, SchemaWrite))]
#[cfg_attr(feature = "wincode", wincode(assert_zero_copy))]
#[cfg_attr(feature = "serde-traits", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde-traits", serde(from = "i64", into = "i64"))]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde", serde(from = "i64", into = "i64"))]
#[derive(Clone, Copy, Debug, Default, PartialEq, Pod, Zeroable)]
#[repr(transparent)]
pub struct PodI64([u8; 8]);
Expand All @@ -136,8 +136,8 @@ impl_int_conversion!(PodI64, i64);
feature = "borsh",
derive(BorshDeserialize, BorshSerialize, BorshSchema)
)]
#[cfg_attr(feature = "serde-traits", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde-traits", serde(from = "u128", into = "u128"))]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde", serde(from = "u128", into = "u128"))]
#[derive(Clone, Copy, Debug, Default, PartialEq, Pod, Zeroable)]
#[repr(transparent)]
pub struct PodU128(pub [u8; 16]);
Expand All @@ -157,7 +157,7 @@ mod tests {
}
}

#[cfg(feature = "serde-traits")]
#[cfg(feature = "serde")]
#[test]
fn test_pod_bool_serde() {
let pod_false: PodBool = false.into();
Expand All @@ -180,7 +180,7 @@ mod tests {
assert_eq!(1u16, u16::from(*pod_from_bytes::<PodU16>(&[1, 0]).unwrap()));
}

#[cfg(feature = "serde-traits")]
#[cfg(feature = "serde")]
#[test]
fn test_pod_u16_serde() {
let pod_u16: PodU16 = u16::MAX.into();
Expand All @@ -201,7 +201,7 @@ mod tests {
);
}

#[cfg(feature = "serde-traits")]
#[cfg(feature = "serde")]
#[test]
fn test_pod_i16_serde() {
let pod_i16: PodI16 = i16::MAX.into();
Expand All @@ -224,7 +224,7 @@ mod tests {
);
}

#[cfg(feature = "serde-traits")]
#[cfg(feature = "serde")]
#[test]
fn test_pod_u64_serde() {
let pod_u64: PodU64 = u64::MAX.into();
Expand All @@ -247,7 +247,7 @@ mod tests {
);
}

#[cfg(feature = "serde-traits")]
#[cfg(feature = "serde")]
#[test]
fn test_pod_i64_serde() {
let pod_i64: PodI64 = i64::MAX.into();
Expand All @@ -271,7 +271,7 @@ mod tests {
);
}

#[cfg(feature = "serde-traits")]
#[cfg(feature = "serde")]
#[test]
fn test_pod_u128_serde() {
let pod_u128: PodU128 = u128::MAX.into();
Expand Down
Loading