diff options
Diffstat (limited to 'ecs/src/query/term.rs')
| -rw-r--r-- | ecs/src/query/term.rs | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/ecs/src/query/term.rs b/ecs/src/query/term.rs index 2e1ecca..0683918 100644 --- a/ecs/src/query/term.rs +++ b/ecs/src/query/term.rs @@ -4,7 +4,6 @@ use std::marker::PhantomData; use crate::component::{ Component, Handle as ComponentHandle, - HandleFromEntityComponentRef, HandleMut as ComponentHandleMut, }; use crate::query::{ @@ -65,17 +64,14 @@ impl<ComponentT: Component> TermWithField for Option<&ComponentT> fn get_field<'world>( entity_handle: &crate::entity::Handle<'world>, - world: &'world crate::World, + _world: &'world crate::World, ) -> Self::Field<'world> { Some( ComponentHandle::<'world, ComponentT>::from_entity_component_ref( - Some( - entity_handle - .get_matching_components(ComponentT::id()) - .next()?, - ), - world, + &entity_handle + .get_matching_components(ComponentT::id()) + .next()?, ) .unwrap_or_else(|err| { panic!( @@ -104,11 +100,9 @@ impl<ComponentT: Component> TermWithField for Option<&mut ComponentT> { Some( ComponentHandleMut::<'world, ComponentT>::from_entity_component_ref( - Some( - entity_handle - .get_matching_components(ComponentT::id()) - .next()?, - ), + &entity_handle + .get_matching_components(ComponentT::id()) + .next()?, world, ) .unwrap_or_else(|err| { |