Make converstion to intermediate state async.

We are going to need to do things like call external tools for syntax highlighting so we are going to need async in there eventually.

src/intermediate/definition.rs

@@ -61,11 +61,14 @@ impl BlogPost {
                 let mut ret = Vec::new();
                 for (real_path, _contents, parsed_document) in parsed_org_files.iter() {
                     let relative_to_post_dir_path = real_path.strip_prefix(post_dir)?;
-                    ret.push(BlogPostPage::new(
+                    ret.push(
-                        relative_to_post_dir_path,
+                        BlogPostPage::new(
-                        &mut registry,
+                            relative_to_post_dir_path,
-                        parsed_document,
+                            &mut registry,
-                    )?);
+                            parsed_document,
+                        )
+                        .await?,
+                    );
                 }
                 ret
             };

src/intermediate/element.rs

@@ -9,13 +9,13 @@ pub(crate) enum IElement {
 }
 
 impl IElement {
-    pub(crate) fn new<'parse>(
+    pub(crate) async fn new<'parse>(
         registry: &mut Registry<'parse>,
         elem: &organic::types::Element<'parse>,
     ) -> Result<IElement, CustomError> {
         match elem {
             organic::types::Element::Paragraph(inner) => {
-                Ok(IElement::Paragraph(IParagraph::new(registry, inner)?))
+                Ok(IElement::Paragraph(IParagraph::new(registry, inner).await?))
             }
             organic::types::Element::PlainList(_) => todo!(),
             organic::types::Element::CenterBlock(_) => todo!(),

src/intermediate/heading.rs

@@ -10,15 +10,17 @@ pub(crate) struct IHeading {
 }
 
 impl IHeading {
-    pub(crate) fn new<'parse>(
+    pub(crate) async fn new<'parse>(
         registry: &mut Registry<'parse>,
         heading: &organic::types::Heading<'parse>,
     ) -> Result<IHeading, CustomError> {
-        let title = heading
+        let title = {
-            .title
+            let mut ret = Vec::new();
-            .iter()
+            for obj in heading.title.iter() {
-            .map(|obj| IObject::new(registry, obj))
+                ret.push(IObject::new(registry, obj).await?);
-            .collect::<Result<Vec<_>, _>>()?;
+            }
+            ret
+        };
         Ok(IHeading {
             title,
             level: heading.level,

src/intermediate/object.rs

@@ -11,7 +11,7 @@ pub(crate) enum IObject {
 }
 
 impl IObject {
-    pub(crate) fn new<'parse>(
+    pub(crate) async fn new<'parse>(
         registry: &mut Registry<'parse>,
         obj: &organic::types::Object<'parse>,
     ) -> Result<IObject, CustomError> {
@@ -23,7 +23,7 @@ impl IObject {
             organic::types::Object::Code(_) => todo!(),
             organic::types::Object::Verbatim(_) => todo!(),
             organic::types::Object::PlainText(inner) => {
-                Ok(IObject::PlainText(IPlainText::new(registry, inner)?))
+                Ok(IObject::PlainText(IPlainText::new(registry, inner).await?))
             }
             organic::types::Object::RegularLink(_) => todo!(),
             organic::types::Object::RadioLink(_) => todo!(),
@@ -41,7 +41,7 @@ impl IObject {
             organic::types::Object::InlineSourceBlock(_) => todo!(),
             organic::types::Object::LineBreak(_) => todo!(),
             organic::types::Object::Target(inner) => {
-                Ok(IObject::Target(ITarget::new(registry, inner)?))
+                Ok(IObject::Target(ITarget::new(registry, inner).await?))
             }
             organic::types::Object::StatisticsCookie(_) => todo!(),
             organic::types::Object::Subscript(_) => todo!(),

src/intermediate/page.rs

@@ -18,7 +18,7 @@ pub(crate) struct BlogPostPage {
 }
 
 impl BlogPostPage {
-    pub(crate) fn new<'parse, P: Into<PathBuf>>(
+    pub(crate) async fn new<'parse, P: Into<PathBuf>>(
         path: P,
         registry: &mut Registry<'parse>,
         document: &organic::types::Document<'parse>,
@@ -26,10 +26,14 @@ impl BlogPostPage {
         let path = path.into();
         let mut children = Vec::new();
         if let Some(section) = document.zeroth_section.as_ref() {
-            children.push(IDocumentElement::Section(ISection::new(registry, section)?));
+            children.push(IDocumentElement::Section(
+                ISection::new(registry, section).await?,
+            ));
         }
         for heading in document.children.iter() {
-            children.push(IDocumentElement::Heading(IHeading::new(registry, heading)?));
+            children.push(IDocumentElement::Heading(
+                IHeading::new(registry, heading).await?,
+            ));
         }
 
         Ok(BlogPostPage {

src/intermediate/paragraph.rs

@@ -9,15 +9,17 @@ pub(crate) struct IParagraph {
 }
 
 impl IParagraph {
-    pub(crate) fn new<'parse>(
+    pub(crate) async fn new<'parse>(
         registry: &mut Registry<'parse>,
         paragraph: &organic::types::Paragraph<'parse>,
     ) -> Result<IParagraph, CustomError> {
-        let children = paragraph
+        let children = {
-            .children
+            let mut ret = Vec::new();
-            .iter()
+            for obj in paragraph.children.iter() {
-            .map(|obj| IObject::new(registry, obj))
+                ret.push(IObject::new(registry, obj).await?);
-            .collect::<Result<Vec<_>, _>>()?;
+            }
+            ret
+        };
 
         Ok(IParagraph { children })
     }

src/intermediate/plain_text.rs

@@ -9,9 +9,9 @@ pub(crate) struct IPlainText {
 }
 
 impl IPlainText {
-    pub(crate) fn new(
+    pub(crate) async fn new<'parse>(
-        registry: &mut Registry<'_>,
+        registry: &mut Registry<'parse>,
-        plain_text: &organic::types::PlainText<'_>,
+        plain_text: &organic::types::PlainText<'parse>,
     ) -> Result<IPlainText, CustomError> {
         Ok(IPlainText {
             source: coalesce_whitespace(plain_text.source).into_owned(),

src/intermediate/section.rs

@@ -9,15 +9,17 @@ pub(crate) struct ISection {
 }
 
 impl ISection {
-    pub(crate) fn new<'parse>(
+    pub(crate) async fn new<'parse>(
         registry: &mut Registry<'parse>,
         section: &organic::types::Section<'parse>,
     ) -> Result<ISection, CustomError> {
-        let children = section
+        let children = {
-            .children
+            let mut ret = Vec::new();
-            .iter()
+            for elem in section.children.iter() {
-            .map(|obj| IElement::new(registry, obj))
+                ret.push(IElement::new(registry, elem).await?);
-            .collect::<Result<Vec<_>, _>>()?;
+            }
+            ret
+        };
 
         Ok(ISection { children })
     }

src/intermediate/target.rs

@@ -10,7 +10,7 @@ pub(crate) struct ITarget {
 }
 
 impl ITarget {
-    pub(crate) fn new<'parse>(
+    pub(crate) async fn new<'parse>(
         registry: &mut Registry<'parse>,
         target: &organic::types::Target<'parse>,
     ) -> Result<ITarget, CustomError> {