summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2022-09-03 09:52:25 +0300
committerLars Wirzenius <liw@liw.fi>2022-09-03 09:52:25 +0300
commit1827c48e73545e2fac1158814bc20b52547cfeda (patch)
tree13d4e9d0253f8180220759bcd98de5645bdad35e /src
parent2341869c78cea3647eadd46bbfc7f703541cee0b (diff)
downloadsubplot-1827c48e73545e2fac1158814bc20b52547cfeda.tar.gz
refactor: rename ast::Metadata to ast::YamlMetadata for clarity
This reduces the confusion with metadata::Metadata and Pandoc's metadata. Sponsored-by: author
Diffstat (limited to 'src')
-rw-r--r--src/ast.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ast.rs b/src/ast.rs
index eb10efc..915e679 100644
--- a/src/ast.rs
+++ b/src/ast.rs
@@ -54,12 +54,12 @@ impl std::str::FromStr for AbstractSyntaxTree {
trace!("Parsing markdown");
let ast = if let Some((yaml, markdown)) = get_yaml(&LEADING_YAML_PATTERN, markdown) {
trace!("Found leading YAML: {:?}", yaml);
- let meta = Metadata::new(yaml)?.to_map();
+ let meta = YamlMetadata::new(yaml)?.to_map();
let blocks = parse_blocks(markdown);
AbstractSyntaxTree::new(meta, blocks)
} else if let Some((yaml, _markdown)) = get_yaml(&TRAILING_YAML_PATTERN, markdown) {
trace!("Found trailing YAML: {:?}", yaml);
- let meta = Metadata::new(yaml)?.to_map();
+ let meta = YamlMetadata::new(yaml)?.to_map();
let blocks = parse_blocks(markdown);
AbstractSyntaxTree::new(meta, blocks)
} else {
@@ -287,7 +287,7 @@ pub enum Error {
// misspelled field.
#[derive(Debug, Default, Deserialize)]
#[serde(deny_unknown_fields)]
-struct Metadata {
+struct YamlMetadata {
title: String,
subtitle: Option<String>,
author: Option<String>,
@@ -300,7 +300,7 @@ struct Metadata {
impls: BTreeMap<String, Vec<PathBuf>>,
}
-impl Metadata {
+impl YamlMetadata {
fn new(yaml_text: &str) -> Result<Self, Error> {
trace!("Parsing YAML");
let meta: Self = serde_yaml::from_str(yaml_text)?;
@@ -367,7 +367,7 @@ fn meta_path_bufs(v: &[PathBuf]) -> MetaValue {
#[cfg(test)]
mod test {
- use super::{parse_code_block_attrs, AbstractSyntaxTree, Metadata};
+ use super::{parse_code_block_attrs, AbstractSyntaxTree, YamlMetadata};
use super::{Block, Inline};
use std::path::PathBuf;
use std::str::FromStr;
@@ -442,7 +442,7 @@ mod test {
#[test]
fn full_meta() {
- let meta = Metadata::new(
+ let meta = YamlMetadata::new(
"\
title: Foo Bar
date: today