Move set-like exports to crate::set

Author: LikeLakers2

crates/bevy_reflect/src/impls/indexmap.rs

@@ -1,7 +1,9 @@
 use crate::{
-    utility::GenericTypeInfoCell, FromReflect, FromType, Generics, GetTypeRegistration,
-    PartialReflect, Reflect, ReflectCloneError, ReflectFromPtr, ReflectMut, ReflectOwned,
-    ReflectRef, Set, SetInfo, TypeInfo, TypeParamInfo, TypePath, TypeRegistration,
+    set::{Set, SetInfo},
+    utility::GenericTypeInfoCell,
+    FromReflect, FromType, Generics, GetTypeRegistration, PartialReflect, Reflect,
+    ReflectCloneError, ReflectFromPtr, ReflectMut, ReflectOwned, ReflectRef, TypeInfo,
+    TypeParamInfo, TypePath, TypeRegistration,
 };
 use bevy_platform::prelude::{Box, Vec};
 use bevy_reflect::{
@@ -377,11 +379,11 @@ where
     }
 
     fn apply(&mut self, value: &dyn PartialReflect) {
-        crate::set_apply(self, value);
+        crate::set::set_apply(self, value);
     }
 
     fn try_apply(&mut self, value: &dyn PartialReflect) -> Result<(), crate::ApplyError> {
-        crate::set_try_apply(self, value)
+        crate::set::set_try_apply(self, value)
     }
 
     fn reflect_kind(&self) -> ReflectKind {
@@ -409,7 +411,7 @@ where
     }
 
     fn reflect_partial_eq(&self, value: &dyn PartialReflect) -> Option<bool> {
-        crate::set_partial_eq(self, value)
+        crate::set::set_partial_eq(self, value)
     }
 }
 

crates/bevy_reflect/src/kind.rs

@@ -4,7 +4,7 @@ use thiserror::Error;
 #[cfg(feature = "functions")]
 use crate::func::Function;
 use crate::{
-    array::Array, enums::Enum, list::List, map::Map, PartialReflect, Set, Struct, Tuple,
+    array::Array, enums::Enum, list::List, map::Map, set::Set, PartialReflect, Struct, Tuple,
     TupleStruct,
 };
 

crates/bevy_reflect/src/lib.rs

@@ -543,6 +543,7 @@
 //! [`'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
+//! [`Set`]: crate::set::Set
 //! [`Map`]: crate::map::Map
 //! [`Enum`]: crate::enums::Enum
 //! [`Function`]: crate::func::Function
@@ -600,7 +601,7 @@ mod path;
 mod reflect;
 mod reflectable;
 mod remote;
-mod set;
+pub mod set;
 mod struct_trait;
 mod tuple;
 mod tuple_struct;
@@ -671,7 +672,6 @@ pub use path::*;
 pub use reflect::*;
 pub use reflectable::*;
 pub use remote::*;
-pub use set::*;
 pub use struct_trait::*;
 pub use tuple::*;
 pub use tuple_struct::*;

crates/bevy_reflect/src/reflect.rs

@@ -1,5 +1,5 @@
 use crate::{
-    array::array_debug, enums::enum_debug, list::list_debug, map::map_debug, set_debug,
+    array::array_debug, enums::enum_debug, list::list_debug, map::map_debug, set::set_debug,
     struct_debug, tuple_debug, tuple_struct_debug, DynamicTypePath, DynamicTyped, OpaqueInfo,
     ReflectCloneError, ReflectKind, ReflectKindMismatchError, ReflectMut, ReflectOwned, ReflectRef,
     TypeInfo, TypePath, Typed,
@@ -189,10 +189,10 @@ where
     /// [`List`]: crate::list::List
     /// [`Array`]: crate::array::Array
     /// [`Map`]: crate::map::Map
-    /// [`Set`]: crate::Set
+    /// [`Set`]: crate::set::Set
     /// [`list_apply`]: crate::list::list_apply
     /// [`map_apply`]: crate::map::map_apply
-    /// [`set_apply`]: crate::set_apply
+    /// [`set_apply`]: crate::set::set_apply
     ///
     /// # Panics
     ///

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

@@ -1,6 +1,7 @@
 use crate::{
     serde::{de::registration_utils::try_get_registration, TypedReflectDeserializer},
-    DynamicSet, Set, SetInfo, TypeRegistry,
+    set::{DynamicSet, Set, SetInfo},
+    TypeRegistry,
 };
 use core::{fmt, fmt::Formatter};
 use serde::de::{SeqAccess, Visitor};
@@ -9,7 +10,7 @@ use super::ReflectDeserializerProcessor;
 
 /// A [`Visitor`] for deserializing [`Set`] values.
 ///
-/// [`Set`]: crate::Set
+/// [`Set`]: crate::set::Set
 pub(super) struct SetVisitor<'a, P> {
     pub set_info: &'static SetInfo,
     pub registry: &'a TypeRegistry,

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

@@ -1,4 +1,4 @@
-use crate::{serde::TypedReflectSerializer, Set, TypeRegistry};
+use crate::{serde::TypedReflectSerializer, set::Set, TypeRegistry};
 use serde::{ser::SerializeSeq, Serialize};
 
 use super::ReflectSerializerProcessor;

crates/bevy_reflect/src/set.rs

@@ -1,3 +1,6 @@
+//! A trait used to power [set-like] operations via reflection.
+//!
+//! [set-like]: https://doc.rust-lang.org/stable/std/collections/struct.HashSet.html
 use alloc::{boxed::Box, format, vec::Vec};
 use core::fmt::{Debug, Formatter};
 
@@ -29,7 +32,7 @@ use crate::{
 /// # Example
 ///
 /// ```
-/// use bevy_reflect::{PartialReflect, Set};
+/// use bevy_reflect::{PartialReflect, set::Set};
 /// use std::collections::HashSet;
 ///
 ///
@@ -488,7 +491,7 @@ pub fn set_try_apply<S: Set>(a: &mut S, b: &dyn PartialReflect) -> Result<(), Ap
 
 #[cfg(test)]
 mod tests {
-    use crate::{PartialReflect, Set};
+    use crate::{set::Set, PartialReflect};
 
     use super::DynamicSet;
     use alloc::string::{String, ToString};

crates/bevy_reflect/src/type_info.rs

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

examples/reflection/dynamic_types.rs

@@ -7,9 +7,10 @@ use bevy::reflect::{
     map::DynamicMap,
     reflect_trait,
     serde::TypedReflectDeserializer,
+    set::{DynamicSet, Set},
     std_traits::ReflectDefault,
-    DynamicSet, DynamicStruct, DynamicTuple, DynamicTupleStruct, FromReflect, PartialReflect,
-    Reflect, ReflectFromReflect, Set, TypeRegistry, Typed,
+    DynamicStruct, DynamicTuple, DynamicTupleStruct, FromReflect, PartialReflect, Reflect,
+    ReflectFromReflect, TypeRegistry, Typed,
 };
 use serde::de::DeserializeSeed;
 use std::collections::{HashMap, HashSet};