Remove closures from iselector macro.

src/intermediate/document_element.rs

@@ -12,23 +12,19 @@ pub(crate) enum IDocumentElement {
     Section(ISection),
 }
 
-iselector!(
+iselector!(IDocumentElement, DocumentElement, original, registry, {
-    IDocumentElement,
+    iitem!(
-    DocumentElement,
+        registry,
-    |registry, original| async {
+        original,
-        iitem!(
+        (
-            registry,
+            organic::types::DocumentElement::Heading,
-            original,
+            IDocumentElement::Heading,
-            (
+            IHeading
-                organic::types::DocumentElement::Heading,
+        ),
-                IDocumentElement::Heading,
+        (
-                IHeading
+            organic::types::DocumentElement::Section,
-            ),
+            IDocumentElement::Section,
-            (
+            ISection
-                organic::types::DocumentElement::Section,
+        ),
-                IDocumentElement::Section,
+    )
-                ISection
+});
-            ),
-        )
-    }
-);

src/intermediate/element.rs

@@ -56,7 +56,7 @@ pub(crate) enum IElement {
     LatexEnvironment(ILatexEnvironment),
 }
 
-iselector!(IElement, Element, |registry, original| async {
+iselector!(IElement, Element, original, registry, {
     iitem!(
         registry,
         original,

src/intermediate/macros.rs

@@ -43,13 +43,18 @@ pub(crate) use intermediate;
 ///
 /// This exists to make changing the type signature easier.
 macro_rules! iselector {
-    ($istruct:ident, $pstruct:ident, $fnbody:expr) => {
+    ($istruct:ident, $pstruct:ident, $original:ident, $registry:ident, $fnbody:tt) => {
         impl $istruct {
-            pub(crate) fn new<'reg, 'orig, 'parse, 'inp: 'reg + 'orig>(
+            pub(crate) fn new<'reg, 'orig, 'parse, 'inp: 'reg + 'orig + 'parse>(
                 registry: &'reg mut Registry<'orig, 'parse>,
                 original: &'orig organic::types::$pstruct<'parse>,
             ) -> BoxFuture<'inp, Result<$istruct, CustomError>> {
-                $fnbody(registry, original).boxed()
+                async move {
+                    let $registry = registry;
+                    let $original = original;
+                    $fnbody
+                }
+                .boxed()
             }
         }
     };
@@ -61,8 +66,8 @@ macro_rules! iitem {
     ($registry:expr, $original:expr, $(($penum:path, $ienum:path, $istruct:ident),)*) => {
         match $original {
 $(
-            &$penum(inner) => Ok($ienum(
+            $penum(inner) => Ok($ienum(
-                $istruct::new($registry, &inner).await?,
+                $istruct::new($registry, inner).await?,
             )),
 )*
             }

src/intermediate/object.rs

@@ -63,7 +63,7 @@ pub(crate) enum IObject {
     Timestamp(ITimestamp),
 }
 
-iselector!(IObject, Object, |registry, original| async {
+iselector!(IObject, Object, original, registry, {
     iitem!(
         registry,
         original,