Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-23 05:03:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

bevy_reflect: Remove unnecessary Clone bounds (#5783)

Browse source 
# Objective

Some of the reflection impls for container types had unnecessary `Clone` bounds on their generic arguments. These come from before `FromReflect` when types were instead bound by `Reflect + Clone`. With `FromReflect` this is no longer necessary.

## Solution

Removed all leftover `Clone` bounds from types that use `FromReflect` instead.

## Note

I skipped `Result<T, E>`, `HashSet<T>`, and `Range<T>` since those do not use `FromReflect`. This should probably be handled in a separate PR since it would be a breaking change.

---

## Changelog

- Remove unnecessary `Clone` bounds on reflected containers
This commit is contained in:
Gino Valente 2022-08-24 21:21:11 +00:00
parent 880ea5d4be
commit 7da97b4dee
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/bevy_reflect/src/impls/smallvec.rs
View file

@ -9,7 +9,7 @@ use crate::{
impl<T: smallvec::Array + Send + Sync + 'static> Array for SmallVec<T> impl<T: smallvec::Array + Send + Sync + 'static> Array for SmallVec<T>
where where
T::Item: FromReflect + Clone, T::Item: FromReflect,
{ {
fn get(&self, index: usize) -> Option<&dyn Reflect> { fn get(&self, index: usize) -> Option<&dyn Reflect> {
if index < SmallVec::len(self) { if index < SmallVec::len(self) {
@ -41,7 +41,7 @@ where
impl<T: smallvec::Array + Send + Sync + 'static> List for SmallVec<T> impl<T: smallvec::Array + Send + Sync + 'static> List for SmallVec<T>
where where
T::Item: FromReflect + Clone, T::Item: FromReflect,
{ {
fn push(&mut self, value: Box<dyn Reflect>) { fn push(&mut self, value: Box<dyn Reflect>) {
let value = value.take::<T::Item>().unwrap_or_else(|value| { let value = value.take::<T::Item>().unwrap_or_else(|value| {
@ -58,7 +58,7 @@ where
impl<T: smallvec::Array + Send + Sync + 'static> Reflect for SmallVec<T> impl<T: smallvec::Array + Send + Sync + 'static> Reflect for SmallVec<T>
where where
T::Item: FromReflect + Clone, T::Item: FromReflect,
{ {
fn type_name(&self) -> &str { fn type_name(&self) -> &str {
std::any::type_name::<Self>() std::any::type_name::<Self>()
@ -116,7 +116,7 @@ where
impl<T: smallvec::Array + Send + Sync + 'static> Typed for SmallVec<T> impl<T: smallvec::Array + Send + Sync + 'static> Typed for SmallVec<T>
where where
T::Item: FromReflect + Clone, T::Item: FromReflect,
{ {
fn type_info() -> &'static TypeInfo { fn type_info() -> &'static TypeInfo {
static CELL: GenericTypeInfoCell = GenericTypeInfoCell::new(); static CELL: GenericTypeInfoCell = GenericTypeInfoCell::new();
@ -126,7 +126,7 @@ where
impl<T: smallvec::Array + Send + Sync + 'static> FromReflect for SmallVec<T> impl<T: smallvec::Array + Send + Sync + 'static> FromReflect for SmallVec<T>
where where
T::Item: FromReflect + Clone, T::Item: FromReflect,
{ {
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() {
@ -143,7 +143,7 @@ where
impl<T: smallvec::Array + Send + Sync + 'static> GetTypeRegistration for SmallVec<T> impl<T: smallvec::Array + Send + Sync + 'static> GetTypeRegistration for SmallVec<T>
where where
T::Item: FromReflect + Clone, T::Item: FromReflect,
{ {
fn get_type_registration() -> TypeRegistration { fn get_type_registration() -> TypeRegistration {
let mut registration = TypeRegistration::of::<SmallVec<T>>(); let mut registration = TypeRegistration::of::<SmallVec<T>>();

4
crates/bevy_reflect/src/impls/std.rs
View file

@ -346,8 +346,8 @@ impl<K: FromReflect + Eq + Hash, V: FromReflect> Typed for HashMap<K, V> {
impl<K, V> GetTypeRegistration for HashMap<K, V> impl<K, V> GetTypeRegistration for HashMap<K, V>
where where
K: FromReflect + Clone + Eq + Hash, K: FromReflect + Eq + Hash,
V: FromReflect + Clone, V: FromReflect,
{ {
fn get_type_registration() -> TypeRegistration { fn get_type_registration() -> TypeRegistration {
let mut registration = TypeRegistration::of::<HashMap<K, V>>(); let mut registration = TypeRegistration::of::<HashMap<K, V>>();