merge fixes

bevyengine · Jun 23, 2023 · bd0b407 · bd0b407
1 parent 469c927
commit bd0b407
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 27 deletions.
diff --git a/crates/bevy_reflect/src/impls/std.rs b/crates/bevy_reflect/src/impls/std.rs
@@ -87,6 +87,7 @@ impl_reflect_value!(isize(
 ));
 impl_reflect_value!(f32(Debug, PartialEq, Serialize, Deserialize, Default));
 impl_reflect_value!(f64(Debug, PartialEq, Serialize, Deserialize, Default));
+impl_type_path!(str);
 impl_reflect_value!(::alloc::string::String(
     Debug,
     Hash,
@@ -1071,8 +1072,6 @@ impl<T: TypePath + ?Sized> TypePath for &'static T {
         static CELL: GenericTypePathCell = GenericTypePathCell::new();
         CELL.get_or_insert::<Self, _>(|| format!("&{}", T::short_type_path()))
     }
-
-    const TYPE_PATH_ID: TypePathId = TypePathId::from_base("&").with_generics(&[T::TYPE_PATH_ID]);
 }
 
 impl Reflect for Cow<'static, str> {
@@ -1179,8 +1178,6 @@ impl FromReflect for Cow<'static, str> {
     }
 }
 
-impl<T: PathOnly> PathOnly for [T] where [T]: ToOwned {}
-
 impl<T: TypePath> TypePath for [T]
 where
     [T]: ToOwned,
@@ -1196,8 +1193,6 @@ where
     }
 }
 
-impl<T: ToOwned> PathOnly for T {}
-
 impl<T: FromReflect + Clone + TypePath> List for Cow<'static, [T]> {
     fn get(&self, index: usize) -> Option<&dyn Reflect> {
         self.as_ref().get(index).map(|x| x as &dyn Reflect)
@@ -1229,7 +1224,7 @@ impl<T: FromReflect + Clone + TypePath> List for Cow<'static, [T]> {
             T::from_reflect(&*value).unwrap_or_else(|| {
                 panic!(
                     "Attempted to insert invalid value of type {}.",
-                    value.type_name()
+                    value.reflect_type_path()
                 )
             })
         });
@@ -1244,7 +1239,7 @@ impl<T: FromReflect + Clone + TypePath> List for Cow<'static, [T]> {
         let value = T::take_from_reflect(value).unwrap_or_else(|value| {
             panic!(
                 "Attempted to push invalid value of type {}.",
-                value.type_name()
+                value.reflect_type_path()
             )
         });
         self.to_mut().push(value);
@@ -1258,10 +1253,6 @@ impl<T: FromReflect + Clone + TypePath> List for Cow<'static, [T]> {
 }
 
 impl<T: FromReflect + Clone + TypePath> Reflect for Cow<'static, [T]> {
-    fn type_name(&self) -> &str {
-        std::any::type_name::<Self>()
-    }
-
     fn into_any(self: Box<Self>) -> Box<dyn Any> {
         self
     }
@@ -1434,18 +1425,6 @@ impl Typed for &'static Path {
     }
 }
 
-impl TypePath for &'static Path {
-    fn type_path() -> &'static str {
-        static CELL: GenericTypePathCell = GenericTypePathCell::new();
-        CELL.get_or_insert::<Self, _>(|| "&std::path::Path".to_owned())
-    }
-
-    fn short_type_path() -> &'static str {
-        static CELL: GenericTypePathCell = GenericTypePathCell::new();
-        CELL.get_or_insert::<Self, _>(|| "&Path".to_owned())
-    }
-}
-
 impl GetTypeRegistration for &'static Path {
     fn get_type_registration() -> TypeRegistration {
         let mut registration = TypeRegistration::of::<Self>();
@@ -1547,6 +1526,7 @@ impl Typed for Cow<'static, Path> {
     }
 }
 
+impl_type_path!(::std::path::Path);
 impl_type_path!(::alloc::borrow::Cow<'a: 'static, T: ToOwned + ?Sized>);
 
 impl FromReflect for Cow<'static, Path> {

diff --git a/crates/bevy_reflect/src/lib.rs b/crates/bevy_reflect/src/lib.rs
@@ -1389,7 +1389,7 @@ mod tests {
         let info = MyCowStr::type_info();
         if let TypeInfo::Value(info) = info {
             assert!(info.is::<MyCowStr>());
-            assert_eq!(std::any::type_name::<MyCowStr>(), info.type_name());
+            assert_eq!(std::any::type_name::<MyCowStr>(), info.type_path());
         } else {
             panic!("Expected `TypeInfo::Value`");
         }
@@ -1405,8 +1405,11 @@ mod tests {
         if let TypeInfo::List(info) = info {
             assert!(info.is::<MyCowSlice>());
             assert!(info.item_is::<u8>());
-            assert_eq!(std::any::type_name::<MyCowSlice>(), info.type_name());
-            assert_eq!(std::any::type_name::<u8>(), info.item_type_name());
+            assert_eq!(std::any::type_name::<MyCowSlice>(), info.type_path());
+            assert_eq!(
+                std::any::type_name::<u8>(),
+                info.item_type_path_vtable().path()
+            );
         } else {
             panic!("Expected `TypeInfo::List`");
         }

diff --git a/crates/bevy_reflect/src/type_path.rs b/crates/bevy_reflect/src/type_path.rs
@@ -1,3 +1,5 @@
+use std::fmt;
+
 /// A static accessor to type paths and names.
 ///
 /// The engine uses this trait over [`std::any::type_name`] for stability and flexibility.