refactor: inline Document::from_ast to its only call site

The extra method doesn't provide anything useful to it's better inline.

Sponsored-by: author

1 files changed, 4 insertions, 20 deletions

diff --git a/src/doc.rs b/src/doc.rs
index 6fbf497..583779b 100644
--- a/src/doc.rs
+++ b/src/doc.rs
@@ -95,25 +95,6 @@ impl Document {
         doc
     }
 
-    fn from_ast<P>(
-        basedir: P,
-        subplot: PathBuf,
-        yamlmeta: &YamlMetadata,
-        markdowns: Vec<Markdown>,
-        style: Style,
-        template: Option<&str>,
-    ) -> Result<Document, SubplotError>
-    where
-        P: AsRef<Path> + Debug,
-    {
-        let meta = Metadata::from_yaml_metadata(basedir, yamlmeta, template)?;
-        trace!("metadata from YAML: {:#?}", meta);
-        let files = Self::all_files(&markdowns)?;
-        let doc = Document::new(subplot, markdowns, meta, files, style);
-        trace!("Loaded from JSON OK");
-        Ok(doc)
-    }
-
     fn all_files(markdowns: &[Markdown]) -> Result<EmbeddedFiles, SubplotError> {
         let mut files = EmbeddedFiles::default();
         for md in markdowns {
@@ -146,7 +127,10 @@ impl Document {
             markdowns.push(Markdown::load_file(&filename)?);
         }
 
-        let doc = Self::from_ast(basedir, filename.into(), &meta, markdowns, style, template)?;
+        let meta = Metadata::from_yaml_metadata(basedir, &meta, template)?;
+        trace!("metadata from YAML: {:#?}", meta);
+        let files = Self::all_files(&markdowns)?;
+        let doc = Document::new(filename.into(), markdowns, meta, files, style);
 
         trace!("Loaded document OK");
         Ok(doc)