Use boxed iterators for now

metaborg · Nov 30, 2023 · a0e1095 · a0e1095
1 parent cf96ac3
commit a0e1095
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/scopegraphs-lib/src/lib.rs b/scopegraphs-lib/src/lib.rs
@@ -1,5 +1,3 @@
-#![feature(impl_trait_in_assoc_type)]
-
 pub mod label;
 pub mod resolve;
 pub mod scopegraph;
diff --git a/scopegraphs-lib/src/scopegraph/completeness.rs b/scopegraphs-lib/src/scopegraph/completeness.rs
@@ -64,15 +64,15 @@ impl<LABEL: Hash + Eq, DATA> Completeness<LABEL, DATA> for UncheckedCompleteness
         inner_scope_graph.add_edge(src, lbl, dst)
     }
 
-    type GetEdgesResult<'a> = impl Iterator<Item = Scope> + 'a where DATA: 'a, LABEL: 'a;
+    type GetEdgesResult<'a> = Box<dyn Iterator<Item = Scope> + 'a> where DATA: 'a, LABEL: 'a;
 
     fn get_edges<'a, 'b: 'a>(
         &mut self,
         inner_scope_graph: &'a InnerScopeGraph<LABEL, DATA>,
         src: Scope,
         lbl: &'b LABEL,
     ) -> Self::GetEdgesResult<'a> {
-        inner_scope_graph.get_edges(src, lbl)
+        Box::new(inner_scope_graph.get_edges(src, lbl))
     }
 }
 
@@ -143,7 +143,8 @@ impl<LABEL: Hash + Eq + for<'a> Label<'a>, DATA> Completeness<LABEL, DATA>
         }
     }
 
-    type GetEdgesResult<'a> = EdgesOrDelay<'a, impl Iterator<Item = Scope>, LABEL> where DATA: 'a, LABEL: 'a;
+
+    type GetEdgesResult<'a> = EdgesOrDelay<'a, Box<dyn Iterator<Item = Scope> + 'a>, LABEL> where DATA: 'a, LABEL: 'a;
 
     fn get_edges<'a, 'b: 'a>(
         &mut self,
@@ -158,7 +159,7 @@ impl<LABEL: Hash + Eq + for<'a> Label<'a>, DATA> Completeness<LABEL, DATA>
             }
         } else {
             EdgesOrDelay::Edges {
-                edges: inner_scope_graph.get_edges(src, lbl),
+                edges: Box::new(inner_scope_graph.get_edges(src, lbl)),
             }
         }
     }
@@ -202,7 +203,7 @@ impl<LABEL: Hash + Eq + for<'a> Label<'a>, DATA> Completeness<LABEL, DATA>
         }
     }
 
-    type GetEdgesResult<'a> = impl Iterator<Item = Scope> where DATA: 'a, LABEL: 'a;
+    type GetEdgesResult<'a> = Box<dyn Iterator<Item = Scope> + 'a> where DATA: 'a, LABEL: 'a;
 
     fn get_edges<'a, 'b: 'a>(
         &mut self,
@@ -211,7 +212,7 @@ impl<LABEL: Hash + Eq + for<'a> Label<'a>, DATA> Completeness<LABEL, DATA>
         lbl: &'b LABEL,
     ) -> Self::GetEdgesResult<'a> {
         self.critical_edges.close(src, &lbl);
-        inner_scope_graph.get_edges(src, lbl)
+        Box::new(inner_scope_graph.get_edges(src, lbl))
     }
 }