Skip to content

Commit 6a877d0

Browse files
committed
curious...
1 parent 0dc865e commit 6a877d0

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ libc = "0.2.155"
2525
streaming-iterator = "0.1.5"
2626
serde = {version = "1.0.203", features = ["derive"], optional = true}
2727
serde_json = {version = "1.0.120", optional = true}
28-
bincode = {version = "2", optional = true}
28+
bincode = {version = "2", optional = true, features = ["serde"]}
2929
tskit-derive = {version = "0.2.0", path = "tskit-derive", optional = true}
3030
chrono = { version = "0.4.40", default-features = false, features = ["now", "std"] , optional = true}
3131

@@ -35,7 +35,7 @@ clap = {version = "4.4.6", features = ["derive"]}
3535
serde = {version = "1.0.203", features = ["derive"]}
3636
serde-pickle = "1.1.0"
3737
serde_json = {version = "1.0.120"}
38-
bincode = "2"
38+
bincode = {version = "2", features = ["serde"]}
3939
rand = "0.8.3"
4040
rand_distr = "0.4.0"
4141

src/test_fixtures.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,17 @@ impl Default for GenericMetadata {
1717
#[cfg(test)]
1818
impl crate::metadata::MetadataRoundtrip for GenericMetadata {
1919
fn encode(&self) -> Result<Vec<u8>, crate::metadata::MetadataError> {
20-
handle_metadata_return!(bincode::serialize(&self))
20+
handle_metadata_return!(bincode::serde::encode_to_vec(
21+
&self,
22+
bincode::config::standard()
23+
))
2124
}
2225

2326
fn decode(md: &[u8]) -> Result<Self, crate::metadata::MetadataError> {
24-
handle_metadata_return!(bincode::deserialize(md))
27+
handle_metadata_return!(bincode::serde::decode_from_slice(
28+
md,
29+
bincode::config::standard()
30+
))
2531
}
2632
}
2733

tskit-derive/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fn impl_serde_bincode_roundtrip(name: &syn::Ident) -> TokenStream {
3030
let gen = quote::quote!(
3131
impl ::tskit::metadata::MetadataRoundtrip for #name {
3232
fn encode(&self) -> Result<Vec<u8>, ::tskit::metadata::MetadataError> {
33-
match ::bincode::serialize(&self) {
33+
match ::bincode::serde::serialize(&self) {
3434
Ok(x) => Ok(x),
3535
Err(e) => {
3636
Err(::tskit::metadata::MetadataError::RoundtripError { value: Box::new(e) })

0 commit comments

Comments
 (0)