mirror of
https://github.com/bevyengine/bevy
synced 2025-02-16 22:18:33 +00:00
bevy_reflect: Fix misplaced impls (#6829)
# Objective > Followup to [this](https://github.com/bevyengine/bevy/pull/6755#discussion_r1032671178) comment Rearrange the impls in the `impls/std.rs` file. The issue was that I had accidentally misplaced the impl for `Option<T>` and put it between the `Cow<'static, str>` impls. This is just a slight annoyance and readability issue. ## Solution Move the `Option<T>` and `&'static Path` impls around to be more readable.
This commit is contained in:
parent
919188074c
commit
6ada3566ac
1 changed files with 160 additions and 160 deletions
|
@ -668,166 +668,6 @@ impl_array_get_type_registration! {
|
||||||
30 31 32
|
30 31 32
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Reflect for Cow<'static, str> {
|
|
||||||
fn type_name(&self) -> &str {
|
|
||||||
std::any::type_name::<Self>()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_type_info(&self) -> &'static TypeInfo {
|
|
||||||
<Self as Typed>::type_info()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn into_any(self: Box<Self>) -> Box<dyn Any> {
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
fn as_any(&self) -> &dyn Any {
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
fn as_any_mut(&mut self) -> &mut dyn Any {
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
fn into_reflect(self: Box<Self>) -> Box<dyn Reflect> {
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
fn as_reflect(&self) -> &dyn Reflect {
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
fn as_reflect_mut(&mut self) -> &mut dyn Reflect {
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
fn apply(&mut self, value: &dyn Reflect) {
|
|
||||||
let value = value.as_any();
|
|
||||||
if let Some(value) = value.downcast_ref::<Self>() {
|
|
||||||
*self = value.clone();
|
|
||||||
} else {
|
|
||||||
panic!("Value is not a {}.", std::any::type_name::<Self>());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn set(&mut self, value: Box<dyn Reflect>) -> Result<(), Box<dyn Reflect>> {
|
|
||||||
*self = value.take()?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn reflect_ref(&self) -> ReflectRef {
|
|
||||||
ReflectRef::Value(self)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn reflect_mut(&mut self) -> ReflectMut {
|
|
||||||
ReflectMut::Value(self)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn reflect_owned(self: Box<Self>) -> ReflectOwned {
|
|
||||||
ReflectOwned::Value(self)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn clone_value(&self) -> Box<dyn Reflect> {
|
|
||||||
Box::new(self.clone())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn reflect_hash(&self) -> Option<u64> {
|
|
||||||
let mut hasher = crate::ReflectHasher::default();
|
|
||||||
Hash::hash(&std::any::Any::type_id(self), &mut hasher);
|
|
||||||
Hash::hash(self, &mut hasher);
|
|
||||||
Some(hasher.finish())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn reflect_partial_eq(&self, value: &dyn Reflect) -> Option<bool> {
|
|
||||||
let value = value.as_any();
|
|
||||||
if let Some(value) = value.downcast_ref::<Self>() {
|
|
||||||
Some(std::cmp::PartialEq::eq(self, value))
|
|
||||||
} else {
|
|
||||||
Some(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Reflect for &'static Path {
|
|
||||||
fn type_name(&self) -> &str {
|
|
||||||
std::any::type_name::<Self>()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_type_info(&self) -> &'static TypeInfo {
|
|
||||||
<Self as Typed>::type_info()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn into_any(self: Box<Self>) -> Box<dyn Any> {
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
fn as_any(&self) -> &dyn Any {
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
fn as_any_mut(&mut self) -> &mut dyn Any {
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
fn into_reflect(self: Box<Self>) -> Box<dyn Reflect> {
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
fn as_reflect(&self) -> &dyn Reflect {
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
fn as_reflect_mut(&mut self) -> &mut dyn Reflect {
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
fn apply(&mut self, value: &dyn Reflect) {
|
|
||||||
let value = value.as_any();
|
|
||||||
if let Some(&value) = value.downcast_ref::<Self>() {
|
|
||||||
*self = value;
|
|
||||||
} else {
|
|
||||||
panic!("Value is not a {}.", std::any::type_name::<Self>());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn set(&mut self, value: Box<dyn Reflect>) -> Result<(), Box<dyn Reflect>> {
|
|
||||||
*self = value.take()?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn reflect_ref(&self) -> ReflectRef {
|
|
||||||
ReflectRef::Value(self)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn reflect_mut(&mut self) -> ReflectMut {
|
|
||||||
ReflectMut::Value(self)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn reflect_owned(self: Box<Self>) -> ReflectOwned {
|
|
||||||
ReflectOwned::Value(self)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn clone_value(&self) -> Box<dyn Reflect> {
|
|
||||||
Box::new(*self)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn reflect_hash(&self) -> Option<u64> {
|
|
||||||
let mut hasher = crate::ReflectHasher::default();
|
|
||||||
Hash::hash(&std::any::Any::type_id(self), &mut hasher);
|
|
||||||
Hash::hash(self, &mut hasher);
|
|
||||||
Some(hasher.finish())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn reflect_partial_eq(&self, value: &dyn Reflect) -> Option<bool> {
|
|
||||||
let value = value.as_any();
|
|
||||||
if let Some(value) = value.downcast_ref::<Self>() {
|
|
||||||
Some(std::cmp::PartialEq::eq(self, value))
|
|
||||||
} else {
|
|
||||||
Some(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<T: FromReflect> GetTypeRegistration for Option<T> {
|
impl<T: FromReflect> GetTypeRegistration for Option<T> {
|
||||||
fn get_type_registration() -> TypeRegistration {
|
fn get_type_registration() -> TypeRegistration {
|
||||||
TypeRegistration::of::<Option<T>>()
|
TypeRegistration::of::<Option<T>>()
|
||||||
|
@ -1074,6 +914,86 @@ impl<T: FromReflect> Typed for Option<T> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Reflect for Cow<'static, str> {
|
||||||
|
fn type_name(&self) -> &str {
|
||||||
|
std::any::type_name::<Self>()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_type_info(&self) -> &'static TypeInfo {
|
||||||
|
<Self as Typed>::type_info()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn into_any(self: Box<Self>) -> Box<dyn Any> {
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn as_any(&self) -> &dyn Any {
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn as_any_mut(&mut self) -> &mut dyn Any {
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn into_reflect(self: Box<Self>) -> Box<dyn Reflect> {
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn as_reflect(&self) -> &dyn Reflect {
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn as_reflect_mut(&mut self) -> &mut dyn Reflect {
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn apply(&mut self, value: &dyn Reflect) {
|
||||||
|
let value = value.as_any();
|
||||||
|
if let Some(value) = value.downcast_ref::<Self>() {
|
||||||
|
*self = value.clone();
|
||||||
|
} else {
|
||||||
|
panic!("Value is not a {}.", std::any::type_name::<Self>());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn set(&mut self, value: Box<dyn Reflect>) -> Result<(), Box<dyn Reflect>> {
|
||||||
|
*self = value.take()?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn reflect_ref(&self) -> ReflectRef {
|
||||||
|
ReflectRef::Value(self)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn reflect_mut(&mut self) -> ReflectMut {
|
||||||
|
ReflectMut::Value(self)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn reflect_owned(self: Box<Self>) -> ReflectOwned {
|
||||||
|
ReflectOwned::Value(self)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn clone_value(&self) -> Box<dyn Reflect> {
|
||||||
|
Box::new(self.clone())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn reflect_hash(&self) -> Option<u64> {
|
||||||
|
let mut hasher = crate::ReflectHasher::default();
|
||||||
|
Hash::hash(&std::any::Any::type_id(self), &mut hasher);
|
||||||
|
Hash::hash(self, &mut hasher);
|
||||||
|
Some(hasher.finish())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn reflect_partial_eq(&self, value: &dyn Reflect) -> Option<bool> {
|
||||||
|
let value = value.as_any();
|
||||||
|
if let Some(value) = value.downcast_ref::<Self>() {
|
||||||
|
Some(std::cmp::PartialEq::eq(self, value))
|
||||||
|
} else {
|
||||||
|
Some(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl Typed for Cow<'static, str> {
|
impl Typed for Cow<'static, str> {
|
||||||
fn type_info() -> &'static TypeInfo {
|
fn type_info() -> &'static TypeInfo {
|
||||||
static CELL: NonGenericTypeInfoCell = NonGenericTypeInfoCell::new();
|
static CELL: NonGenericTypeInfoCell = NonGenericTypeInfoCell::new();
|
||||||
|
@ -1102,6 +1022,86 @@ impl FromReflect for Cow<'static, str> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Reflect for &'static Path {
|
||||||
|
fn type_name(&self) -> &str {
|
||||||
|
std::any::type_name::<Self>()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_type_info(&self) -> &'static TypeInfo {
|
||||||
|
<Self as Typed>::type_info()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn into_any(self: Box<Self>) -> Box<dyn Any> {
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn as_any(&self) -> &dyn Any {
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn as_any_mut(&mut self) -> &mut dyn Any {
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn into_reflect(self: Box<Self>) -> Box<dyn Reflect> {
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn as_reflect(&self) -> &dyn Reflect {
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn as_reflect_mut(&mut self) -> &mut dyn Reflect {
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn apply(&mut self, value: &dyn Reflect) {
|
||||||
|
let value = value.as_any();
|
||||||
|
if let Some(&value) = value.downcast_ref::<Self>() {
|
||||||
|
*self = value;
|
||||||
|
} else {
|
||||||
|
panic!("Value is not a {}.", std::any::type_name::<Self>());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn set(&mut self, value: Box<dyn Reflect>) -> Result<(), Box<dyn Reflect>> {
|
||||||
|
*self = value.take()?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn reflect_ref(&self) -> ReflectRef {
|
||||||
|
ReflectRef::Value(self)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn reflect_mut(&mut self) -> ReflectMut {
|
||||||
|
ReflectMut::Value(self)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn reflect_owned(self: Box<Self>) -> ReflectOwned {
|
||||||
|
ReflectOwned::Value(self)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn clone_value(&self) -> Box<dyn Reflect> {
|
||||||
|
Box::new(*self)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn reflect_hash(&self) -> Option<u64> {
|
||||||
|
let mut hasher = crate::ReflectHasher::default();
|
||||||
|
Hash::hash(&std::any::Any::type_id(self), &mut hasher);
|
||||||
|
Hash::hash(self, &mut hasher);
|
||||||
|
Some(hasher.finish())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn reflect_partial_eq(&self, value: &dyn Reflect) -> Option<bool> {
|
||||||
|
let value = value.as_any();
|
||||||
|
if let Some(value) = value.downcast_ref::<Self>() {
|
||||||
|
Some(std::cmp::PartialEq::eq(self, value))
|
||||||
|
} else {
|
||||||
|
Some(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl Typed for &'static Path {
|
impl Typed for &'static Path {
|
||||||
fn type_info() -> &'static TypeInfo {
|
fn type_info() -> &'static TypeInfo {
|
||||||
static CELL: NonGenericTypeInfoCell = NonGenericTypeInfoCell::new();
|
static CELL: NonGenericTypeInfoCell = NonGenericTypeInfoCell::new();
|
||||||
|
|
Loading…
Add table
Reference in a new issue