a8b9c945c7
# Objective - Contributes to #15460 ## Solution - Added two new features, `std` (default) and `alloc`, gating `std` and `alloc` behind them respectively. - Added missing `f32` functions to `std_ops` as required. These `f32` methods have been added to the `clippy.toml` deny list to aid in `no_std` development. ## Testing - CI - `cargo clippy -p bevy_math --no-default-features --features libm --target "x86_64-unknown-none"` - `cargo test -p bevy_math --no-default-features --features libm` - `cargo test -p bevy_math --no-default-features --features "libm, alloc"` - `cargo test -p bevy_math --no-default-features --features "libm, alloc, std"` - `cargo test -p bevy_math --no-default-features --features "std"` ## Notes The following items require the `alloc` feature to be enabled: - `CubicBSpline` - `CubicBezier` - `CubicCardinalSpline` - `CubicCurve` - `CubicGenerator` - `CubicHermite` - `CubicNurbs` - `CyclicCubicGenerator` - `RationalCurve` - `RationalGenerator` - `BoxedPolygon` - `BoxedPolyline2d` - `BoxedPolyline3d` - `SampleCurve` - `SampleAutoCurve` - `UnevenSampleCurve` - `UnevenSampleAutoCurve` - `EvenCore` - `UnevenCore` - `ChunkedUnevenCore` This requirement could be relaxed in certain cases, but I had erred on the side of gating rather than modifying. Since `no_std` is a new set of platforms we are adding support to, and the `alloc` feature is enabled by default, this is not a breaking change. --------- Co-authored-by: Benjamin Brienen <benjamin.brienen@outlook.com> Co-authored-by: Matty <2975848+mweatherley@users.noreply.github.com> Co-authored-by: Joona Aalto <jondolf.dev@gmail.com>
68 lines
2.0 KiB
Rust
68 lines
2.0 KiB
Rust
//! This module defines serialization/deserialization for const generic arrays.
|
|
//! Unlike serde's default behavior, it supports arbitrarily large arrays.
|
|
//! The code is based on this github comment:
|
|
//! <https://github.com/serde-rs/serde/issues/1937#issuecomment-812137971>
|
|
|
|
pub(crate) mod array {
|
|
use core::marker::PhantomData;
|
|
use serde::{
|
|
de::{SeqAccess, Visitor},
|
|
ser::SerializeTuple,
|
|
Deserialize, Deserializer, Serialize, Serializer,
|
|
};
|
|
|
|
pub fn serialize<S: Serializer, T: Serialize, const N: usize>(
|
|
data: &[T; N],
|
|
ser: S,
|
|
) -> Result<S::Ok, S::Error> {
|
|
let mut s = ser.serialize_tuple(N)?;
|
|
for item in data {
|
|
s.serialize_element(item)?;
|
|
}
|
|
s.end()
|
|
}
|
|
|
|
struct GenericArrayVisitor<T, const N: usize>(PhantomData<T>);
|
|
|
|
impl<'de, T, const N: usize> Visitor<'de> for GenericArrayVisitor<T, N>
|
|
where
|
|
T: Deserialize<'de>,
|
|
{
|
|
type Value = [T; N];
|
|
|
|
fn expecting(&self, formatter: &mut core::fmt::Formatter) -> core::fmt::Result {
|
|
formatter.write_fmt(format_args!("an array of length {}", N))
|
|
}
|
|
|
|
#[inline]
|
|
fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
|
|
where
|
|
A: SeqAccess<'de>,
|
|
{
|
|
let mut data = [const { Option::<T>::None }; N];
|
|
|
|
for element in data.iter_mut() {
|
|
match (seq.next_element())? {
|
|
Some(val) => *element = Some(val),
|
|
None => return Err(serde::de::Error::invalid_length(N, &self)),
|
|
}
|
|
}
|
|
|
|
let data = data.map(|value| match value {
|
|
Some(value) => value,
|
|
None => unreachable!(),
|
|
});
|
|
|
|
Ok(data)
|
|
}
|
|
}
|
|
|
|
pub fn deserialize<'de, D, T, const N: usize>(deserializer: D) -> Result<[T; N], D::Error>
|
|
where
|
|
D: Deserializer<'de>,
|
|
T: Deserialize<'de>,
|
|
{
|
|
deserializer.deserialize_tuple(N, GenericArrayVisitor::<T, N>(PhantomData))
|
|
}
|
|
}
|