Internal iterator ref

[Lokathor]

No description provided.

[danielhenrymantilla]

The following lets cargo c --tests pass (I admit the problem of this pattern seems to be with the horrendous diagnostics when InternalIteratorThing<Item = …> is used instead of the proper InternalIteratorThing<ItemThing = …>):

• (I had to add the rev = specification to the .toml file since the project does not track its .lock file, and since the remote repo has, since, removed its label feature.)

diff --git a/Cargo.toml b/Cargo.toml
index 80e7807..c37db04 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,7 @@ logos = "0.14.0"
 chumsky = { git = "https://github.com/zesterer/chumsky", features = [
   "label",
   "pratt",
-] }
+], rev = "9d1ee8c" }
 ariadne = { git = "https://github.com/zesterer/ariadne" }
 internal-iterator = "0.2.3"
 #rayon = "1.7.0"
diff --git a/src/ast/data/if_else.rs b/src/ast/data/if_else.rs
index e50c9b2..9d74fe3 100644
--- a/src/ast/data/if_else.rs
+++ b/src/ast/data/if_else.rs
@@ -58,7 +58,7 @@ impl IfElse {
 
   pub fn calls_ref(
     &self,
-  ) -> impl '_ + InternalIterator<Item = &'_ FileSpanned<Call>> {
+  ) -> impl '_ + InternalIteratorRef<ItemRef = &'_ FileSpanned<Call>> {
     return CallsRef(self);
     // where:
     struct CallsRef<'r>(&'r IfElse);
@@ -76,7 +76,7 @@ impl IfElse {
         for stmt in self.0.if_body.iter() {
           stmt.calls_ref().try_for_each_ref(&mut *f)?;
         }
-        for stmt in self.0.else_body.iter_mut() {
+        for stmt in self.0.else_body.iter() {
           stmt.calls_ref().try_for_each_ref(&mut *f)?;
         }
         ControlFlow::Continue(())
diff --git a/src/ast/data/loop_.rs b/src/ast/data/loop_.rs
index 4178e36..4e8acee 100644
--- a/src/ast/data/loop_.rs
+++ b/src/ast/data/loop_.rs
@@ -66,7 +66,7 @@ impl Loop {
 
   pub fn calls_ref(
     &self,
-  ) -> impl '_ + InternalIterator<Item = &'_ FileSpanned<Call>> {
+  ) -> impl '_ + InternalIteratorRef<ItemRef = &'_ FileSpanned<Call>> {
     return CallsRef(self);
     // where:
     struct CallsRef<'r>(&'r Loop);
diff --git a/src/ast/data/statement.rs b/src/ast/data/statement.rs
index 14882ce..44755b1 100644
--- a/src/ast/data/statement.rs
+++ b/src/ast/data/statement.rs
@@ -51,7 +51,7 @@ impl Statement {
 
   pub fn calls_ref(
     &self,
-  ) -> impl '_ + InternalIteratorRef<Item = &'_ FileSpanned<Call>> {
+  ) -> impl '_ + InternalIteratorRef<ItemRef = &'_ FileSpanned<Call>> {
     return CallsRef(self);
     // where:
     struct CallsRef<'r>(&'r Statement);

That being said, I believe the Mut of InternalIteratorMut is w.r.t. the &mut impl Fn… arg it gets, not w.r.t. the items the iteration yields. In other words, it could be renamed as InternalIteratorExt (for clarity), and be used here. That way you won't have to duplicate the trait def and the guts! helper macro 🙂

[danielhenrymantilla]

PR submitted:

• InternalIteratorRef fix #42