refactor(engine-ecs): remove distinction between query terms with & without a field

1 files changed, 5 insertions, 7 deletions

diff --git a/engine-ecs/src/lib.rs b/engine-ecs/src/lib.rs
index 3a867ba..97316f9 100644
--- a/engine-ecs/src/lib.rs
+++ b/engine-ecs/src/lib.rs
@@ -45,8 +45,7 @@ use crate::phase::{
 };
 use crate::query::flexible::Query as FlexibleQuery;
 use crate::query::{
-    TermWithFieldTuple as QueryTermWithFieldTuple,
-    TermWithoutFieldTuple as QueryTermWithoutFieldTuple,
+    TermTuple as QueryTermTuple,
     Terms as QueryTerms,
     TermsBuilderInterface,
     MAX_TERM_CNT as QUERY_MAX_TERM_CNT,
@@ -286,12 +285,11 @@ impl World
         extension.collect(extension_collector);
     }
 
-    pub fn query<FieldTerms, FieldlessTerms>(
-        &self,
-    ) -> Query<'_, FieldTerms, FieldlessTerms>
+    pub fn query<'this, TermsT>(
+        &'this self,
+    ) -> Query<'this, TermsT>
     where
-        FieldTerms: QueryTermWithFieldTuple,
-        FieldlessTerms: QueryTermWithoutFieldTuple,
+        TermsT: QueryTermTuple<'this>,
     {
         Query::new(self)
     }