Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

pod: Use bytemuck_derive explicitly #6928

Merged
merged 1 commit into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions libraries/pod/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ borsh = ["dep:borsh"]
base64 = { version = "0.22.1", optional = true }
borsh = { version = "1.5.1", optional = true }
bytemuck = { version = "1.16.1" }
bytemuck_derive = { version = "1.7.0" }
serde = { version = "1.0.203", optional = true }
solana-program = "2.0.0"
solana-zk-token-sdk = "2.0.0"
Expand Down
2 changes: 1 addition & 1 deletion libraries/pod/src/optional_keys.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use {
std::{convert::TryFrom, fmt, str::FromStr},
};
use {
bytemuck::{Pod, Zeroable},
bytemuck_derive::{Pod, Zeroable},
solana_program::{program_error::ProgramError, program_option::COption, pubkey::Pubkey},
solana_zk_token_sdk::zk_token_elgamal::pod::ElGamalPubkey,
};
Expand Down
2 changes: 1 addition & 1 deletion libraries/pod/src/primitives.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! primitive types that can be used in `Pod`s
#[cfg(feature = "borsh")]
use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
use bytemuck::{Pod, Zeroable};
use bytemuck_derive::{Pod, Zeroable};
#[cfg(feature = "serde-traits")]
use serde::{Deserialize, Serialize};

Expand Down
6 changes: 5 additions & 1 deletion libraries/pod/src/slice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,11 @@ fn max_len_for_type<T>(data_len: usize) -> Result<usize, ProgramError> {

#[cfg(test)]
mod tests {
use {super::*, crate::bytemuck::pod_slice_to_bytes, bytemuck::Zeroable};
use {
super::*,
crate::bytemuck::pod_slice_to_bytes,
bytemuck_derive::{Pod, Zeroable},
};

#[repr(C)]
#[derive(Clone, Copy, Debug, Default, PartialEq, Pod, Zeroable)]
Expand Down
Loading