miscellaneous simplifications

Author: Victoronz

crates/bevy_ecs/src/entity/entity_set.rs

@@ -373,7 +373,7 @@ pub struct UniqueEntityIter<I: Iterator<Item: EntityEquivalent>> {
 impl<I: EntitySetIterator> UniqueEntityIter<I> {
     /// Constructs a `UniqueEntityIter` from an [`EntitySetIterator`].
     #[inline]
-    pub const fn from_entity_set_iter<S>(iter: I) -> Self {
+    pub const fn from_entity_set_iter(iter: I) -> Self {
         // SAFETY: iter implements `EntitySetIterator`.
         unsafe { Self::from_iter_unchecked(iter) }
     }

crates/bevy_ecs/src/entity/hash_set.rs

@@ -45,12 +45,6 @@ impl EntityHashSet {
         Self(HashSet::with_capacity_and_hasher(n, EntityHash))
     }
 
-    /// Returns the number of elements in the set.
-    #[inline]
-    pub fn len(&self) -> usize {
-        self.0.len()
-    }
-
     /// Returns `true` if the set contains no elements.
     #[inline]
     pub fn is_empty(&self) -> bool {

crates/bevy_ecs/src/entity/unique_array.rs

@@ -158,16 +158,14 @@ impl<T: EntityEquivalent, const N: usize> Deref for UniqueEntityEquivalentArray<
 
     #[inline]
     fn deref(&self) -> &Self::Target {
-        // SAFETY: All elements in the original array are unique.
-        unsafe { UniqueEntityEquivalentSlice::from_slice_unchecked(&self.0) }
+        self.as_slice()
     }
 }
 
 impl<T: EntityEquivalent, const N: usize> DerefMut for UniqueEntityEquivalentArray<T, N> {
     #[inline]
     fn deref_mut(&mut self) -> &mut Self::Target {
-        // SAFETY: All elements in the original array are unique.
-        unsafe { UniqueEntityEquivalentSlice::from_slice_unchecked_mut(&mut self.0) }
+        self.as_mut_slice()
     }
 }
 

crates/bevy_ecs/src/relationship/relationship_source_collection.rs

@@ -262,7 +262,7 @@ impl RelationshipSourceCollection for EntityHashSet {
     }
 
     fn len(&self) -> usize {
-        self.len()
+        self.deref().len()
     }
 
     fn clear(&mut self) {