forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add reflection support for VecDeque (#6831)

Browse Source 
# Objective
This is an adoption of #5792. Fixes #5791.

## Solution
Implemented all the required reflection traits for `VecDeque`, taking from `Vec`'s impls.

---

## Changelog
Added: `std::collections::VecDeque` now implements `Reflect` and all relevant traits.

Co-authored-by: james7132 <contact@jamessliu.com>
This commit is contained in:
James Liu 2022-12-11 18:22:08 +00:00
parent 6903a9411b
commit b37a6ca9a2
1 changed files with 155 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
crates/bevy_reflect/src/impls/std.rs
View File

@ -15,6 +15,7 @@ use bevy_utils::{HashMap, HashSet};
use std::{ use std::{
any::Any, any::Any,
borrow::Cow, borrow::Cow,
collections::VecDeque,
ffi::OsString, ffi::OsString,
hash::{Hash, Hasher}, hash::{Hash, Hasher},
num::{ num::{
@ -177,20 +178,22 @@ impl_from_reflect_value!(NonZeroU16);
impl_from_reflect_value!(NonZeroU8); impl_from_reflect_value!(NonZeroU8);
impl_from_reflect_value!(NonZeroI8); impl_from_reflect_value!(NonZeroI8);
impl<T: FromReflect> Array for Vec<T> { macro_rules! impl_reflect_for_veclike {
($ty:ty, $push:expr, $pop:expr, $sub:ty) => {
impl<T: FromReflect> Array for $ty {
#[inline] #[inline]
fn get(&self, index: usize) -> Option<&dyn Reflect> { fn get(&self, index: usize) -> Option<&dyn Reflect> {
<[T]>::get(self, index).map(|value| value as &dyn Reflect) <$sub>::get(self, index).map(|value| value as &dyn Reflect)
} }
#[inline] #[inline]
fn get_mut(&mut self, index: usize) -> Option<&mut dyn Reflect> { fn get_mut(&mut self, index: usize) -> Option<&mut dyn Reflect> {
<[T]>::get_mut(self, index).map(|value| value as &mut dyn Reflect) <$sub>::get_mut(self, index).map(|value| value as &mut dyn Reflect)
} }
#[inline] #[inline]
fn len(&self) -> usize { fn len(&self) -> usize {
<[T]>::len(self) <$sub>::len(self)
} }
#[inline] #[inline]
@ -209,7 +212,7 @@ impl<T: FromReflect> Array for Vec<T> {
} }
} }
impl<T: FromReflect> List for Vec<T> { impl<T: FromReflect> List for $ty {
fn push(&mut self, value: Box<dyn Reflect>) { fn push(&mut self, value: Box<dyn Reflect>) {
let value = value.take::<T>().unwrap_or_else(|value| { let value = value.take::<T>().unwrap_or_else(|value| {
T::from_reflect(&*value).unwrap_or_else(|| { T::from_reflect(&*value).unwrap_or_else(|| {
@ -219,15 +222,15 @@ impl<T: FromReflect> List for Vec<T> {
) )
}) })
}); });
Vec::push(self, value); $push(self, value);
} }
fn pop(&mut self) -> Option<Box<dyn Reflect>> { fn pop(&mut self) -> Option<Box<dyn Reflect>> {
self.pop().map(|value| Box::new(value) as Box<dyn Reflect>) $pop(self).map(|value| Box::new(value) as Box<dyn Reflect>)
} }
} }
impl<T: FromReflect> Reflect for Vec<T> { impl<T: FromReflect> Reflect for $ty {
fn type_name(&self) -> &str { fn type_name(&self) -> &str {
std::any::type_name::<Self>() std::any::type_name::<Self>()
} }
@ -294,14 +297,14 @@ impl<T: FromReflect> Reflect for Vec<T> {
} }
} }
impl<T: FromReflect> Typed for Vec<T> { impl<T: FromReflect> Typed for $ty {
fn type_info() -> &'static TypeInfo { fn type_info() -> &'static TypeInfo {
static CELL: GenericTypeInfoCell = GenericTypeInfoCell::new(); static CELL: GenericTypeInfoCell = GenericTypeInfoCell::new();
CELL.get_or_insert::<Self, _>(|| TypeInfo::List(ListInfo::new::<Self, T>())) CELL.get_or_insert::<Self, _>(|| TypeInfo::List(ListInfo::new::<Self, T>()))
} }
} }
impl<T: FromReflect> GetTypeRegistration for Vec<T> { impl<T: FromReflect> GetTypeRegistration for $ty {
fn get_type_registration() -> TypeRegistration { fn get_type_registration() -> TypeRegistration {
let mut registration = TypeRegistration::of::<Vec<T>>(); let mut registration = TypeRegistration::of::<Vec<T>>();
registration.insert::<ReflectFromPtr>(FromType::<Vec<T>>::from_type()); registration.insert::<ReflectFromPtr>(FromType::<Vec<T>>::from_type());
@ -309,12 +312,12 @@ impl<T: FromReflect> GetTypeRegistration for Vec<T> {
} }
} }
impl<T: FromReflect> FromReflect for Vec<T> { impl<T: FromReflect> FromReflect for $ty {
fn from_reflect(reflect: &dyn Reflect) -> Option<Self> { fn from_reflect(reflect: &dyn Reflect) -> Option<Self> {
if let ReflectRef::List(ref_list) = reflect.reflect_ref() { if let ReflectRef::List(ref_list) = reflect.reflect_ref() {
let mut new_list = Self::with_capacity(ref_list.len()); let mut new_list = Self::with_capacity(ref_list.len());
for field in ref_list.iter() { for field in ref_list.iter() {
new_list.push(T::from_reflect(field)?); $push(&mut new_list, T::from_reflect(field)?);
} }
Some(new_list) Some(new_list)
} else { } else {
@ -322,6 +325,16 @@ impl<T: FromReflect> FromReflect for Vec<T> {
} }
} }
} }
};
}
impl_reflect_for_veclike!(Vec<T>, Vec::push, Vec::pop, [T]);
impl_reflect_for_veclike!(
VecDeque<T>,
VecDeque::push_back,
VecDeque::pop_back,
VecDeque::<T>
);
impl<K: FromReflect + Eq + Hash, V: FromReflect> Map for HashMap<K, V> { impl<K: FromReflect + Eq + Hash, V: FromReflect> Map for HashMap<K, V> {
fn get(&self, key: &dyn Reflect) -> Option<&dyn Reflect> { fn get(&self, key: &dyn Reflect) -> Option<&dyn Reflect> {