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:
parent
c16a884ccb
commit
183dfc1b5f
@ -118,7 +118,7 @@ wgpu-types = { version = "24", features = [
|
|||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
ron = "0.8.0"
|
ron = "0.8.0"
|
||||||
rmp-serde = "1.1"
|
rmp-serde = "1.1"
|
||||||
bincode = "1.3"
|
bincode = { version = "2.0", features = ["serde"] }
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
serde = { version = "1", features = ["derive"] }
|
serde = { version = "1", features = ["derive"] }
|
||||||
static_assertions = "1.1.0"
|
static_assertions = "1.1.0"
|
||||||
|
@ -30,7 +30,6 @@ mod tests {
|
|||||||
vec,
|
vec,
|
||||||
vec::Vec,
|
vec::Vec,
|
||||||
};
|
};
|
||||||
use bincode::Options;
|
|
||||||
use core::{any::TypeId, f32::consts::PI, ops::RangeInclusive};
|
use core::{any::TypeId, f32::consts::PI, ops::RangeInclusive};
|
||||||
use serde::{de::DeserializeSeed, Deserialize};
|
use serde::{de::DeserializeSeed, Deserialize};
|
||||||
use serde::{de::IgnoredAny, Deserializer};
|
use serde::{de::IgnoredAny, Deserializer};
|
||||||
@ -470,10 +469,9 @@ mod tests {
|
|||||||
|
|
||||||
let deserializer = ReflectDeserializer::new(®istry);
|
let deserializer = ReflectDeserializer::new(®istry);
|
||||||
|
|
||||||
let dynamic_output = bincode::DefaultOptions::new()
|
let config = bincode::config::standard().with_fixed_int_encoding();
|
||||||
.with_fixint_encoding()
|
let (dynamic_output, _read_bytes) =
|
||||||
.deserialize_seed(deserializer, &input)
|
bincode::serde::seed_decode_from_slice(deserializer, &input, config).unwrap();
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
let output = <MyStruct as FromReflect>::from_reflect(dynamic_output.as_ref()).unwrap();
|
let output = <MyStruct as FromReflect>::from_reflect(dynamic_output.as_ref()).unwrap();
|
||||||
assert_eq!(expected, output);
|
assert_eq!(expected, output);
|
||||||
|
@ -24,8 +24,9 @@ mod tests {
|
|||||||
serde::{ReflectSerializer, ReflectSerializerProcessor},
|
serde::{ReflectSerializer, ReflectSerializerProcessor},
|
||||||
PartialReflect, Reflect, ReflectSerialize, Struct, TypeRegistry,
|
PartialReflect, Reflect, ReflectSerialize, Struct, TypeRegistry,
|
||||||
};
|
};
|
||||||
|
#[cfg(feature = "functions")]
|
||||||
|
use alloc::boxed::Box;
|
||||||
use alloc::{
|
use alloc::{
|
||||||
boxed::Box,
|
|
||||||
string::{String, ToString},
|
string::{String, ToString},
|
||||||
vec,
|
vec,
|
||||||
vec::Vec,
|
vec::Vec,
|
||||||
@ -348,7 +349,8 @@ mod tests {
|
|||||||
let registry = get_registry();
|
let registry = get_registry();
|
||||||
|
|
||||||
let serializer = ReflectSerializer::new(&input, ®istry);
|
let serializer = ReflectSerializer::new(&input, ®istry);
|
||||||
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![
|
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,
|
1, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 0, 98, 101, 118, 121, 95, 114, 101, 102,
|
||||||
|
@ -43,7 +43,7 @@ uuid = { version = "1.13.1", default-features = false, features = ["js"] }
|
|||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
postcard = { version = "1.0", features = ["alloc"] }
|
postcard = { version = "1.0", features = ["alloc"] }
|
||||||
bincode = "1.3"
|
bincode = { version = "2.0", features = ["serde"] }
|
||||||
rmp-serde = "1.1"
|
rmp-serde = "1.1"
|
||||||
|
|
||||||
[lints]
|
[lints]
|
||||||
|
@ -522,7 +522,6 @@ mod tests {
|
|||||||
world::FromWorld,
|
world::FromWorld,
|
||||||
};
|
};
|
||||||
use bevy_reflect::{Reflect, ReflectDeserialize, ReflectSerialize};
|
use bevy_reflect::{Reflect, ReflectDeserialize, ReflectSerialize};
|
||||||
use bincode::Options;
|
|
||||||
use serde::{de::DeserializeSeed, Deserialize, Serialize};
|
use serde::{de::DeserializeSeed, Deserialize, Serialize};
|
||||||
use std::io::BufReader;
|
use std::io::BufReader;
|
||||||
|
|
||||||
@ -894,8 +893,9 @@ mod tests {
|
|||||||
|
|
||||||
let scene = DynamicScene::from_world(&world);
|
let scene = DynamicScene::from_world(&world);
|
||||||
|
|
||||||
|
let config = bincode::config::standard().with_fixed_int_encoding();
|
||||||
let scene_serializer = SceneSerializer::new(&scene, registry);
|
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!(
|
assert_eq!(
|
||||||
vec![
|
vec![
|
||||||
@ -913,9 +913,8 @@ mod tests {
|
|||||||
type_registry: registry,
|
type_registry: registry,
|
||||||
};
|
};
|
||||||
|
|
||||||
let deserialized_scene = bincode::DefaultOptions::new()
|
let (deserialized_scene, _read_bytes) =
|
||||||
.with_fixint_encoding()
|
bincode::serde::seed_decode_from_slice(scene_deserializer, &serialized_scene, config)
|
||||||
.deserialize_seed(scene_deserializer, &serialized_scene)
|
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
assert_eq!(1, deserialized_scene.entities.len());
|
assert_eq!(1, deserialized_scene.entities.len());
|
||||||
|
Loading…
Reference in New Issue
Block a user