Redoing some cleanup that got caught in the revert crossfire

Author: recatek

src/entity.rs

@@ -6,8 +6,8 @@ use std::mem;
 use std::num::NonZeroU32;
 
 use crate::error::EcsError;
-use crate::index::{TrimmedIndex, MAX_DATA_INDEX};
-use crate::traits::{Archetype, ArchetypeCanResolve, EntityKey, EntityKeyTyped};
+use crate::index::{MAX_DATA_INDEX, TrimmedIndex};
+use crate::traits::*;
 use crate::version::{ArchetypeVersion, SlotVersion};
 
 // NOTE: While this is extremely unlikely to change, if it does, the proc
@@ -488,6 +488,54 @@ impl EntityKey for EntityDirectAny {
     type DirectOutput = EntityDirectAny;
 }
 
+impl<'a, A: Archetype + 'a, W: World> EntityKeySelectable<'a, W> for Entity<A>
+where
+    W: WorldHas<A>,
+{
+    type View = <A as Archetype>::View<'a>;
+    type ViewMut = <A as Archetype>::ViewMut<'a>;
+    type Borrow = <A as Archetype>::Borrow<'a>;
+
+    #[inline(always)]
+    fn resolve_view(self, world: &'a mut W) -> Option<Self::View> {
+        world.archetype_mut::<A>().view(self)
+    }
+
+    #[inline(always)]
+    fn resolve_view_mut(self, world: &'a mut W) -> Option<Self::ViewMut> {
+        world.archetype_mut::<A>().view_mut(self)
+    }
+
+    #[inline(always)]
+    fn resolve_borrow(self, world: &'a W) -> Option<Self::Borrow> {
+        world.archetype::<A>().borrow(self)
+    }
+}
+
+impl<'a, A: Archetype + 'a, W: World> EntityKeySelectable<'a, W> for EntityDirect<A>
+where
+    W: WorldHas<A>,
+{
+    type View = <A as Archetype>::View<'a>;
+    type ViewMut = <A as Archetype>::ViewMut<'a>;
+    type Borrow = <A as Archetype>::Borrow<'a>;
+
+    #[inline(always)]
+    fn resolve_view(self, world: &'a mut W) -> Option<Self::View> {
+        world.archetype_mut::<A>().view(self)
+    }
+
+    #[inline(always)]
+    fn resolve_view_mut(self, world: &'a mut W) -> Option<Self::ViewMut> {
+        world.archetype_mut::<A>().view_mut(self)
+    }
+
+    #[inline(always)]
+    fn resolve_borrow(self, world: &'a W) -> Option<Self::Borrow> {
+        world.archetype::<A>().borrow(self)
+    }
+}
+
 impl<'a, A: Archetype> From<&'a Entity<A>> for &'a EntityAny {
     #[inline(always)]
     fn from(value: &'a Entity<A>) -> Self {

src/traits.rs

@@ -1097,51 +1097,3 @@ pub trait EntityKeySelectable<'a, W: World>: EntityKey {
     #[doc(hidden)]
     fn resolve_borrow(self, world: &'a W) -> Option<Self::Borrow>;
 }
-
-impl<'a, A: Archetype + 'a, W: World> EntityKeySelectable<'a, W> for Entity<A>
-where
-    W: WorldHas<A>,
-{
-    type View = <A as Archetype>::View<'a>;
-    type ViewMut = <A as Archetype>::ViewMut<'a>;
-    type Borrow = <A as Archetype>::Borrow<'a>;
-
-    #[inline(always)]
-    fn resolve_view(self, world: &'a mut W) -> Option<Self::View> {
-        world.archetype_mut::<A>().view(self)
-    }
-
-    #[inline(always)]
-    fn resolve_view_mut(self, world: &'a mut W) -> Option<Self::ViewMut> {
-        world.archetype_mut::<A>().view_mut(self)
-    }
-
-    #[inline(always)]
-    fn resolve_borrow(self, world: &'a W) -> Option<Self::Borrow> {
-        world.archetype::<A>().borrow(self)
-    }
-}
-
-impl<'a, A: Archetype + 'a, W: World> EntityKeySelectable<'a, W> for EntityDirect<A>
-where
-    W: WorldHas<A>,
-{
-    type View = <A as Archetype>::View<'a>;
-    type ViewMut = <A as Archetype>::ViewMut<'a>;
-    type Borrow = <A as Archetype>::Borrow<'a>;
-
-    #[inline(always)]
-    fn resolve_view(self, world: &'a mut W) -> Option<Self::View> {
-        world.archetype_mut::<A>().view(self)
-    }
-
-    #[inline(always)]
-    fn resolve_view_mut(self, world: &'a mut W) -> Option<Self::ViewMut> {
-        world.archetype_mut::<A>().view_mut(self)
-    }
-
-    #[inline(always)]
-    fn resolve_borrow(self, world: &'a W) -> Option<Self::Borrow> {
-        world.archetype::<A>().borrow(self)
-    }
-}