wip

src/lazy/any_encoding.rs

@@ -79,6 +79,9 @@ impl<'data> MacroInvocation<'data, AnyEncoding> for LazyRawAnyMacroInvocation<'d
     type ArgumentExpr = LazyRawValueExpr<'data, AnyEncoding>;
     type ArgumentsIterator = LazyRawAnyMacroArgsIterator<'data>;
 
+    type TransientEvaluator<'context> =
+    TransientEExpEvaluator<'context, 'data, AnyEncoding> where Self: 'context, 'data: 'context;
+
     fn id(&self) -> MacroIdRef<'_> {
         match self.encoding {
             LazyRawAnyMacroInvocationKind::Text_1_0(_) => unreachable!("macro in text Ion 1.0"),
@@ -97,16 +100,14 @@ impl<'data> MacroInvocation<'data, AnyEncoding> for LazyRawAnyMacroInvocation<'d
         }
     }
 
-    type TransientEvaluator<'top> = TransientEExpEvaluator<'top, 'data, AnyEncoding> where 'data: 'top, Self: 'top;
-
-    fn make_transient_evaluator<'top>(
-        context: EncodingContext<'top>,
-    ) -> Self::TransientEvaluator<'top>
+    fn make_transient_evaluator<'context>(
+        context: EncodingContext<'context>,
+    ) -> Self::TransientEvaluator<'context>
     where
-        Self: 'top,
-        'data: 'top,
+        'data: 'context,
+        Self: 'context,
     {
-        TransientEExpEvaluator::new(context)
+        Self::TransientEvaluator::new(context)
     }
 }
 

src/lazy/decoder.rs

@@ -183,6 +183,9 @@ impl<'data> MacroInvocation<'data, TextEncoding_1_1> for RawTextMacroInvocation<
     type ArgumentExpr = LazyRawValueExpr<'data, TextEncoding_1_1>;
     type ArgumentsIterator = RawTextSExpIterator_1_1<'data>;
 
+    type TransientEvaluator<'context> =
+    TransientEExpEvaluator<'context, 'data, TextEncoding_1_1>  where Self: 'context, 'data: 'context;
+
     fn id(&self) -> MacroIdRef {
         self.id
     }
@@ -191,16 +194,13 @@ impl<'data> MacroInvocation<'data, TextEncoding_1_1> for RawTextMacroInvocation<
         RawTextSExpIterator_1_1::new(self.arguments_bytes())
     }
 
-    type TransientEvaluator<'top> = TransientEExpEvaluator<'top, 'data, TextEncoding_1_1> where 'data: 'top, Self: 'top;
-
-    fn make_transient_evaluator<'top>(
-        context: EncodingContext<'top>,
-    ) -> Self::TransientEvaluator<'top>
+    fn make_transient_evaluator<'context>(
+        context: EncodingContext<'context>,
+    ) -> Self::TransientEvaluator<'context>
     where
-        Self: 'top,
-        'data: 'top,
+        Self: 'context,
     {
-        TransientEExpEvaluator::new(context)
+        Self::TransientEvaluator::new(context)
     }
 }
 

src/lazy/expanded/e_expression.rs

@@ -14,6 +14,7 @@ impl<'data, D: LazyDecoder<'data>> ToArgumentKind<'data, D, D::MacroInvocation>
         context: EncodingContext<'top>,
     ) -> ArgumentKind<'top, 'data, D, D::MacroInvocation>
     where
+        D::MacroInvocation: 'top,
         Self: 'top,
     {
         match self {