Merge branch 'liw/refactor-metadata' into 'main'

refactor: move YamlMetadata to src/metadata.rs

See merge request subplot/subplot!306

1 files changed, 3 insertions, 5 deletions

diff --git a/src/doc.rs b/src/doc.rs
index 7a7e64c..a39ab99 100644
--- a/src/doc.rs
+++ b/src/doc.rs
@@ -1,4 +1,3 @@
-use crate::ast;
 use crate::bindings::CaptureType;
 use crate::generate_test_program;
 use crate::get_basedir_from;
@@ -6,12 +5,11 @@ use crate::md::Markdown;
 use crate::EmbeddedFile;
 use crate::EmbeddedFiles;
 use crate::MatchedScenario;
-use crate::Metadata;
 use crate::PartialStep;
 use crate::Scenario;
 use crate::Style;
 use crate::SubplotError;
-use crate::YamlMetadata;
+use crate::{Metadata, YamlMetadata};
 use crate::{Warning, Warnings};
 
 use std::collections::HashSet;
@@ -106,7 +104,7 @@ impl Document {
         basedir: P,
         subplot: PathBuf,
         markdowns: Vec<PathBuf>,
-        yamlmeta: &ast::YamlMetadata,
+        yamlmeta: &YamlMetadata,
         mut md: Markdown,
         style: Style,
         template: Option<&str>,
@@ -422,7 +420,7 @@ impl Document {
 fn load_metadata_from_yaml_file(filename: &Path) -> Result<YamlMetadata, SubplotError> {
     let yaml = read(filename).map_err(|e| SubplotError::ReadFile(filename.into(), e))?;
     trace!("Parsing YAML metadata from {}", filename.display());
-    let meta: ast::YamlMetadata = serde_yaml::from_slice(&yaml)
+    let meta: YamlMetadata = serde_yaml::from_slice(&yaml)
         .map_err(|e| SubplotError::MetadataFile(filename.into(), e))?;
     Ok(meta)
 }