Move map-like exports to crate::map

Author: LikeLakers2

benches/benches/bevy_reflect/map.rs

@@ -2,7 +2,7 @@ use core::{fmt::Write, hint::black_box, iter, time::Duration};
 
 use benches::bench;
 use bevy_platform::collections::HashMap;
-use bevy_reflect::{DynamicMap, Map};
+use bevy_reflect::map::{DynamicMap, Map};
 use criterion::{
     criterion_group, measurement::Measurement, AxisScale, BatchSize, BenchmarkGroup, BenchmarkId,
     Criterion, PlotConfiguration, Throughput,

crates/bevy_animation/src/lib.rs

@@ -1522,7 +1522,7 @@ impl<'a> Iterator for TriggeredEventsIter<'a> {
 #[cfg(test)]
 mod tests {
     use crate as bevy_animation;
-    use bevy_reflect::{DynamicMap, Map};
+    use bevy_reflect::map::{DynamicMap, Map};
 
     use super::*;
 

crates/bevy_reflect/src/impls/indexmap.rs

@@ -5,7 +5,8 @@ use crate::{
 };
 use bevy_platform::prelude::{Box, Vec};
 use bevy_reflect::{
-    DynamicMap, Map, MapInfo, MaybeTyped, ReflectFromReflect, ReflectKind, TypeRegistry, Typed,
+    map::{DynamicMap, Map, MapInfo},
+    MaybeTyped, ReflectFromReflect, ReflectKind, TypeRegistry, Typed,
 };
 use bevy_reflect_derive::impl_type_path;
 use core::{any::Any, hash::BuildHasher, hash::Hash};
@@ -140,11 +141,11 @@ where
     }
 
     fn apply(&mut self, value: &dyn PartialReflect) {
-        crate::map_apply(self, value);
+        crate::map::map_apply(self, value);
     }
 
     fn try_apply(&mut self, value: &dyn PartialReflect) -> Result<(), crate::ApplyError> {
-        crate::map_try_apply(self, value)
+        crate::map::map_try_apply(self, value)
     }
 
     fn reflect_kind(&self) -> ReflectKind {
@@ -175,7 +176,7 @@ where
     }
 
     fn reflect_partial_eq(&self, value: &dyn PartialReflect) -> Option<bool> {
-        crate::map_partial_eq(self, value)
+        crate::map::map_partial_eq(self, value)
     }
 }
 

crates/bevy_reflect/src/kind.rs

@@ -4,7 +4,8 @@ use thiserror::Error;
 #[cfg(feature = "functions")]
 use crate::func::Function;
 use crate::{
-    array::Array, enums::Enum, list::List, Map, PartialReflect, Set, Struct, Tuple, TupleStruct,
+    array::Array, enums::Enum, list::List, map::Map, PartialReflect, Set, Struct, Tuple,
+    TupleStruct,
 };
 
 /// An enumeration of the "kinds" of a reflected type.

crates/bevy_reflect/src/lib.rs

@@ -543,10 +543,12 @@
 //! [`'static` lifetime]: https://doc.rust-lang.org/rust-by-example/scope/lifetime/static_lifetime.html#trait-bound
 //! [`Array`]: crate::array::Array
 //! [`List`]: crate::list::List
+//! [`Map`]: crate::map::Map
 //! [`Enum`]: crate::enums::Enum
 //! [`Function`]: crate::func::Function
 //! [`DynamicArray`]: crate::array::DynamicArray
 //! [`DynamicList`]: crate::list::DynamicList
+//! [`DynamicMap`]: crate::map::DynamicMap
 //! [`DynamicEnum`]: crate::enums::DynamicEnum
 //! [derive macro documentation]: derive@crate::Reflect
 //! [deriving `Reflect`]: derive@crate::Reflect
@@ -593,7 +595,7 @@ pub mod func;
 mod is;
 mod kind;
 pub mod list;
-mod map;
+pub mod map;
 mod path;
 mod reflect;
 mod reflectable;
@@ -665,7 +667,6 @@ pub use from_reflect::*;
 pub use generics::*;
 pub use is::*;
 pub use kind::*;
-pub use map::*;
 pub use path::*;
 pub use reflect::*;
 pub use reflectable::*;
@@ -687,7 +688,7 @@ pub use erased_serde;
 #[doc(hidden)]
 pub mod __macro_exports {
     use crate::{
-        array::DynamicArray, enums::DynamicEnum, list::DynamicList, DynamicMap, DynamicStruct,
+        array::DynamicArray, enums::DynamicEnum, list::DynamicList, map::DynamicMap, DynamicStruct,
         DynamicTuple, DynamicTupleStruct, GetTypeRegistration, TypeRegistry,
     };
 
@@ -867,7 +868,7 @@ mod tests {
     };
     use static_assertions::{assert_impl_all, assert_not_impl_all};
 
-    use super::{array::*, enums::*, list::*, prelude::*, *};
+    use super::{array::*, enums::*, list::*, map::*, prelude::*, *};
     use crate::{
         serde::{ReflectDeserializer, ReflectSerializer},
         utility::GenericTypePathCell,

crates/bevy_reflect/src/map.rs

@@ -1,3 +1,6 @@
+//! Traits and types used to power [map-like] operations via reflection.
+//!
+//! [map-like]: https://doc.rust-lang.org/book/ch08-03-hash-maps.html
 use core::fmt::{Debug, Formatter};
 
 use bevy_platform::collections::HashTable;
@@ -29,7 +32,7 @@ use alloc::{boxed::Box, format, vec::Vec};
 /// # Example
 ///
 /// ```
-/// use bevy_reflect::{PartialReflect, Reflect, Map};
+/// use bevy_reflect::{PartialReflect, Reflect, map::Map};
 /// use std::collections::HashMap;
 ///
 ///

crates/bevy_reflect/src/reflect.rs

@@ -1,8 +1,8 @@
 use crate::{
-    array::array_debug, enums::enum_debug, list::list_debug, map_debug, set_debug, struct_debug,
-    tuple_debug, tuple_struct_debug, DynamicTypePath, DynamicTyped, OpaqueInfo, ReflectCloneError,
-    ReflectKind, ReflectKindMismatchError, ReflectMut, ReflectOwned, ReflectRef, TypeInfo,
-    TypePath, Typed,
+    array::array_debug, enums::enum_debug, list::list_debug, map::map_debug, set_debug,
+    struct_debug, tuple_debug, tuple_struct_debug, DynamicTypePath, DynamicTyped, OpaqueInfo,
+    ReflectCloneError, ReflectKind, ReflectKindMismatchError, ReflectMut, ReflectOwned, ReflectRef,
+    TypeInfo, TypePath, Typed,
 };
 use alloc::borrow::Cow;
 use alloc::boxed::Box;
@@ -188,10 +188,10 @@ where
     /// [`Enum`]: crate::enums::Enum
     /// [`List`]: crate::list::List
     /// [`Array`]: crate::array::Array
-    /// [`Map`]: crate::Map
+    /// [`Map`]: crate::map::Map
     /// [`Set`]: crate::Set
     /// [`list_apply`]: crate::list::list_apply
-    /// [`map_apply`]: crate::map_apply
+    /// [`map_apply`]: crate::map::map_apply
     /// [`set_apply`]: crate::set_apply
     ///
     /// # Panics
@@ -353,7 +353,7 @@ where
     /// where `type_path` is the [type path] of the underlying type.
     ///
     /// [`List`]: crate::list::List
-    /// [`Map`]: crate::Map
+    /// [`Map`]: crate::map::Map
     /// [type path]: TypePath::type_path
     fn debug(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         match self.reflect_ref() {

crates/bevy_reflect/src/serde/de/maps.rs

@@ -1,6 +1,7 @@
 use crate::{
+    map::{DynamicMap, Map, MapInfo},
     serde::{de::registration_utils::try_get_registration, TypedReflectDeserializer},
-    DynamicMap, Map, MapInfo, TypeRegistry,
+    TypeRegistry,
 };
 use core::{fmt, fmt::Formatter};
 use serde::de::{MapAccess, Visitor};
@@ -9,7 +10,7 @@ use super::ReflectDeserializerProcessor;
 
 /// A [`Visitor`] for deserializing [`Map`] values.
 ///
-/// [`Map`]: crate::Map
+/// [`Map`]: crate::map::Map
 pub(super) struct MapVisitor<'a, P> {
     pub map_info: &'static MapInfo,
     pub registry: &'a TypeRegistry,

crates/bevy_reflect/src/serde/ser/maps.rs

@@ -1,4 +1,4 @@
-use crate::{serde::TypedReflectSerializer, Map, TypeRegistry};
+use crate::{map::Map, serde::TypedReflectSerializer, TypeRegistry};
 use serde::{ser::SerializeMap, Serialize};
 
 use super::ReflectSerializerProcessor;

crates/bevy_reflect/src/type_info.rs

@@ -2,8 +2,9 @@ use crate::{
     array::{ArrayInfo, DynamicArray},
     enums::{DynamicEnum, EnumInfo},
     list::{DynamicList, ListInfo},
-    DynamicMap, DynamicStruct, DynamicTuple, DynamicTupleStruct, Generics, MapInfo, PartialReflect,
-    Reflect, ReflectKind, SetInfo, StructInfo, TupleInfo, TupleStructInfo, TypePath, TypePathTable,
+    map::{DynamicMap, MapInfo},
+    DynamicStruct, DynamicTuple, DynamicTupleStruct, Generics, PartialReflect, Reflect,
+    ReflectKind, SetInfo, StructInfo, TupleInfo, TupleStructInfo, TypePath, TypePathTable,
 };
 use core::{
     any::{Any, TypeId},
@@ -225,7 +226,7 @@ pub enum TypeInfo {
     Array(ArrayInfo),
     /// Type information for a [map-like] type.
     ///
-    /// [map-like]: crate::Map
+    /// [map-like]: crate::map::Map
     Map(MapInfo),
     /// Type information for a [set-like] type.
     ///