Get rid of the boxed iterator returned from query in favor of impl It…

…erator

.github/workflows/tests.yml

@@ -31,7 +31,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.70.0
+          toolchain: 1.75.0
           override: true
       - name: Build
         run: cargo build --verbose

canrun/Cargo.toml

@@ -10,7 +10,7 @@ categories = ["algorithms", "mathematics"]
 keywords = ["logic", "dsl", "kanren"]
 license = "MIT/Apache-2.0"
 edition = "2021"
-rust-version = "1.70.0"
+rust-version = "1.75.0"
 
 [dependencies]
 im-rc = "15.1.0"

canrun/src/core/query.rs

@@ -24,7 +24,7 @@ A blanket impl covers anything that implements [`StateIterator`], so many
 types including [`Goal`](crate::goals) and [`State`](crate::State) are
 queryable.
 */
-pub trait Query<'a> {
+pub trait Query {
     /**
     Get [reified](crate::core::Reify) results from things that can produce
     [`StateIter`](crate::core::StateIter)s.
@@ -57,11 +57,11 @@ pub trait Query<'a> {
     assert_eq!(result, vec![1])
     ```
     */
-    fn query<Q: Reify + 'a>(self, query: Q) -> Box<dyn Iterator<Item = Q::Reified> + 'a>;
+    fn query<Q: Reify>(self, query: Q) -> impl Iterator<Item = Q::Reified>;
 }
 
-impl<'a, S: StateIterator + 'a> Query<'a> for S {
-    fn query<Q: Reify + 'a>(self, query: Q) -> Box<dyn Iterator<Item = Q::Reified> + 'a> {
+impl<S: StateIterator> Query for S {
+    fn query<Q: Reify>(self, query: Q) -> impl Iterator<Item = Q::Reified> {
         Box::new(
             self.into_states()
                 .filter_map(move |s| query.reify_in(&s.ready()?)),

examples/Cargo.toml

@@ -7,7 +7,7 @@ repository = "https://github.com/tgecho/canrun_rs"
 documentation = "https://docs.rs/crate/canrun_collections"
 license = "MIT/Apache-2.0"
 edition = "2021"
-rust-version = "1.70.0"
+rust-version = "1.75.0"
 
 [dependencies]
 canrun = { path = "../canrun"}