Skip to content

Commit 7aefa29

Browse files
authored
Merge pull request #137 from gitext-rs/renovate/bincode-2.x
chore(deps): Update Rust crate bincode to v2
2 parents 624891e + 9a6b964 commit 7aefa29

File tree

3 files changed

+25
-7
lines changed

3 files changed

+25
-7
lines changed

Cargo.lock

Lines changed: 19 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ resolver = "2"
55
repository = "https://github.com/gitext-rs/git-dive"
66
license = "MIT OR Apache-2.0"
77
edition = "2021"
8-
rust-version = "1.76" # MSRV
8+
rust-version = "1.85" # MSRV
99
include = [
1010
"build.rs",
1111
"src/**/*",
@@ -133,7 +133,7 @@ content_inspector = "0.2.4"
133133
git-config-env = "0.2.1"
134134
shlex = "1.3.0"
135135
anstyle-syntect = "1.0.0"
136-
bincode = "1.3.3"
136+
bincode = { version = "2.0", default-features = false, features = ["std", "serde"] }
137137
serde = { version = "1.0.199", features = ["derive"] }
138138
flate2 = "1.0.30"
139139
once_cell = "1.19.0"

src/assets/mod.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,12 @@ fn asset_from_contents<T: serde::de::DeserializeOwned>(
9393
description: &str,
9494
compressed: bool,
9595
) -> Result<T, Error> {
96+
let config = bincode::config::legacy();
9697
if compressed {
97-
bincode::deserialize_from(flate2::read::ZlibDecoder::new(contents))
98+
let mut reader = flate2::read::ZlibDecoder::new(contents);
99+
bincode::serde::decode_from_std_read(&mut reader, config)
98100
} else {
99-
bincode::deserialize_from(contents)
101+
bincode::serde::decode_from_slice(contents, config).map(|(a, _)| a)
100102
}
101103
.map_err(|_| anyhow::format_err!("Could not parse {}", description))
102104
}

0 commit comments

Comments
 (0)