1 files changed, 24 insertions, 19 deletions
diff --git a/ecs/src/query/flexible.rs b/ecs/src/query/flexible.rs
index 3e72b34..936ab82 100644
--- a/ecs/src/query/flexible.rs
+++ b/ecs/src/query/flexible.rs
@@ -2,13 +2,8 @@
 use std::iter::{repeat_n, FlatMap, RepeatN, Zip};
 
 use crate::component::storage::archetype::{Archetype, EntityIter};
-use crate::component::storage::{
-    ArchetypeRefIter,
-    ArchetypeSearchTerms,
-    Storage as ComponentStorage,
-};
+use crate::component::storage::{ArchetypeRefIter, ArchetypeSearchTerms};
 use crate::entity::Handle as EntityHandle;
-use crate::lock::ReadGuard;
 use crate::query::Terms;
 use crate::World;
 
@@ -17,7 +12,6 @@ use crate::World;
 pub struct Query<'world, const MAX_TERM_CNT: usize>
 {
     world: &'world World,
-    component_storage: ReadGuard<'world, ComponentStorage>,
     terms: Terms<MAX_TERM_CNT>,
 }
 
@@ -28,8 +22,9 @@ impl<'world, const MAX_TERM_CNT: usize> Query<'world, MAX_TERM_CNT>
     pub fn iter(&self) -> Iter<'_>
     {
         Iter {
-            world: self.world,
             iter: self
+                .world
+                .data
                 .component_storage
                 .search_archetypes(ArchetypeSearchTerms {
                     required_components: &self.terms.required_components,
@@ -41,27 +36,37 @@ impl<'world, const MAX_TERM_CNT: usize> Query<'world, MAX_TERM_CNT>
                             .zip(archetype.entities())
                     }) as ComponentIterMapFn,
                 ),
+            world: self.world,
         }
     }
 
+    #[must_use]
+    pub fn world(&self) -> &'world World
+    {
+        self.world
+    }
+
     pub(crate) fn new(world: &'world World, terms: Terms<MAX_TERM_CNT>) -> Self
     {
-        Self {
-            world,
-            component_storage: world
-                .data
-                .component_storage
-                .read_nonblock()
-                .expect("Failed to acquire read-only component storage lock"),
-            terms,
-        }
+        Self { world, terms }
+    }
+}
+
+impl<'query, const MAX_TERM_CNT: usize> IntoIterator for &'query Query<'_, MAX_TERM_CNT>
+{
+    type IntoIter = Iter<'query>;
+    type Item = EntityHandle<'query>;
+
+    fn into_iter(self) -> Self::IntoIter
+    {
+        self.iter()
     }
 }
 
 pub struct Iter<'query>
 {
-    world: &'query World,
     iter: QueryEntityIter<'query>,
+    world: &'query World,
 }
 
 impl<'query> Iterator for Iter<'query>
@@ -72,7 +77,7 @@ impl<'query> Iterator for Iter<'query>
     {
         let (archetype, entity) = self.iter.next()?;
 
-        Some(EntityHandle::new(self.world, archetype, entity))
+        Some(EntityHandle::new(archetype, entity, self.world))
     }
 }