Update bincode to 2.0 (#18396)

# Objective

Update bincode

## Solution

Fix compilation for #18352 by reading the [migration
guide](https://github.com/bincode-org/bincode/blob/trunk/docs/migration_guide.md)

Also fixes an unused import warning I got when running the tests for
bevy_reflect.
This commit is contained in:
Kristoffer Søholm 2025-03-25 05:09:46 +01:00 committed by GitHub
parent 8481b63ed8
commit 7a37c4a109
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 14 additions and 15 deletions

View File

@ -118,7 +118,7 @@ wgpu-types = { version = "24", features = [
[dev-dependencies]
ron = "0.8.0"
rmp-serde = "1.1"
bincode = "1.3"
bincode = { version = "2.0", features = ["serde"] }
serde_json = "1.0"
serde = { version = "1", features = ["derive"] }
static_assertions = "1.1.0"

View File

@ -30,7 +30,6 @@ mod tests {
vec,
vec::Vec,
};
use bincode::Options;
use core::{any::TypeId, f32::consts::PI, ops::RangeInclusive};
use serde::{de::DeserializeSeed, Deserialize};
use serde::{de::IgnoredAny, Deserializer};
@ -470,10 +469,9 @@ mod tests {
let deserializer = ReflectDeserializer::new(&registry);
let dynamic_output = bincode::DefaultOptions::new()
.with_fixint_encoding()
.deserialize_seed(deserializer, &input)
.unwrap();
let config = bincode::config::standard().with_fixed_int_encoding();
let (dynamic_output, _read_bytes) =
bincode::serde::seed_decode_from_slice(deserializer, &input, config).unwrap();
let output = <MyStruct as FromReflect>::from_reflect(dynamic_output.as_ref()).unwrap();
assert_eq!(expected, output);

View File

@ -24,8 +24,9 @@ mod tests {
serde::{ReflectSerializer, ReflectSerializerProcessor},
PartialReflect, Reflect, ReflectSerialize, Struct, TypeRegistry,
};
#[cfg(feature = "functions")]
use alloc::boxed::Box;
use alloc::{
boxed::Box,
string::{String, ToString},
vec,
vec::Vec,
@ -348,7 +349,8 @@ mod tests {
let registry = get_registry();
let serializer = ReflectSerializer::new(&input, &registry);
let bytes = bincode::serialize(&serializer).unwrap();
let config = bincode::config::standard().with_fixed_int_encoding();
let bytes = bincode::serde::encode_to_vec(&serializer, config).unwrap();
let expected: Vec<u8> = vec![
1, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 0, 98, 101, 118, 121, 95, 114, 101, 102,

View File

@ -43,7 +43,7 @@ uuid = { version = "1.13.1", default-features = false, features = ["js"] }
[dev-dependencies]
postcard = { version = "1.0", features = ["alloc"] }
bincode = "1.3"
bincode = { version = "2.0", features = ["serde"] }
rmp-serde = "1.1"
[lints]

View File

@ -522,7 +522,6 @@ mod tests {
world::FromWorld,
};
use bevy_reflect::{Reflect, ReflectDeserialize, ReflectSerialize};
use bincode::Options;
use serde::{de::DeserializeSeed, Deserialize, Serialize};
use std::io::BufReader;
@ -894,8 +893,9 @@ mod tests {
let scene = DynamicScene::from_world(&world);
let config = bincode::config::standard().with_fixed_int_encoding();
let scene_serializer = SceneSerializer::new(&scene, registry);
let serialized_scene = bincode::serialize(&scene_serializer).unwrap();
let serialized_scene = bincode::serde::encode_to_vec(&scene_serializer, config).unwrap();
assert_eq!(
vec![
@ -913,10 +913,9 @@ mod tests {
type_registry: registry,
};
let deserialized_scene = bincode::DefaultOptions::new()
.with_fixint_encoding()
.deserialize_seed(scene_deserializer, &serialized_scene)
.unwrap();
let (deserialized_scene, _read_bytes) =
bincode::serde::seed_decode_from_slice(scene_deserializer, &serialized_scene, config)
.unwrap();
assert_eq!(1, deserialized_scene.entities.len());
assert_scene_eq(&scene, &deserialized_scene);