summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2023-01-28 19:43:10 +0200
committerLars Wirzenius <liw@liw.fi>2023-01-28 19:46:03 +0200
commite7861cabfc610291d534ae078765a71dc7007c7e (patch)
tree8d9a64262d309498369ff7f42bc7546215f3437a
parente1d63019fdd6f0d24703197b6a6029f26e6f089f (diff)
downloadsubplot-e7861cabfc610291d534ae078765a71dc7007c7e.tar.gz
refactor: move visitor, panhelper, typeset modules into md
This commit just moves files around and fixes references to moved modules. Sponsored-by: author
-rw-r--r--src/lib.rs6
-rw-r--r--src/md.rs10
-rw-r--r--src/md/panhelper.rs (renamed from src/panhelper.rs)0
-rw-r--r--src/md/typeset.rs (renamed from src/typeset.rs)0
-rw-r--r--src/md/visitor/block_class.rs (renamed from src/visitor/block_class.rs)0
-rw-r--r--src/md/visitor/embedded.rs (renamed from src/visitor/embedded.rs)2
-rw-r--r--src/md/visitor/image.rs (renamed from src/visitor/image.rs)0
-rw-r--r--src/md/visitor/linting.rs (renamed from src/visitor/linting.rs)2
-rw-r--r--src/md/visitor/mod.rs (renamed from src/visitor/mod.rs)0
-rw-r--r--src/md/visitor/structure.rs (renamed from src/visitor/structure.rs)2
-rw-r--r--src/md/visitor/typesetting.rs (renamed from src/visitor/typesetting.rs)4
11 files changed, 13 insertions, 13 deletions
diff --git a/src/lib.rs b/src/lib.rs
index 1ae64d4..90c183f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -27,12 +27,6 @@ mod embedded;
pub use embedded::EmbeddedFile;
pub use embedded::EmbeddedFiles;
-mod panhelper;
-mod typeset;
-
-mod visitor;
-use visitor::LintingVisitor;
-
mod policy;
pub use policy::get_basedir_from;
diff --git a/src/md.rs b/src/md.rs
index 15fe57a..6f00ab7 100644
--- a/src/md.rs
+++ b/src/md.rs
@@ -1,8 +1,8 @@
//! A parsed Markdown document.
use crate::{
- parse_scenario_snippet, visitor, Bindings, EmbeddedFiles, LintingVisitor, Scenario,
- ScenarioStep, Style, SubplotError, Warning, YamlMetadata,
+ parse_scenario_snippet, Bindings, EmbeddedFiles, Scenario, ScenarioStep, Style, SubplotError,
+ Warning, YamlMetadata,
};
use log::trace;
use pandoc_ast::{Map, MetaValue, MutVisitor, Pandoc};
@@ -11,6 +11,12 @@ use std::collections::HashSet;
use std::convert::TryFrom;
use std::path::{Path, PathBuf};
+mod panhelper;
+mod typeset;
+
+mod visitor;
+use visitor::LintingVisitor;
+
/// A parsed Markdown document.
#[derive(Debug)]
pub struct Markdown {
diff --git a/src/panhelper.rs b/src/md/panhelper.rs
index f7ab801..f7ab801 100644
--- a/src/panhelper.rs
+++ b/src/md/panhelper.rs
diff --git a/src/typeset.rs b/src/md/typeset.rs
index f63206a..f63206a 100644
--- a/src/typeset.rs
+++ b/src/md/typeset.rs
diff --git a/src/visitor/block_class.rs b/src/md/visitor/block_class.rs
index 303616b..303616b 100644
--- a/src/visitor/block_class.rs
+++ b/src/md/visitor/block_class.rs
diff --git a/src/visitor/embedded.rs b/src/md/visitor/embedded.rs
index 891240b..840d9ed 100644
--- a/src/visitor/embedded.rs
+++ b/src/md/visitor/embedded.rs
@@ -1,4 +1,4 @@
-use crate::panhelper;
+use crate::md::panhelper;
use crate::EmbeddedFile;
use crate::EmbeddedFiles;
diff --git a/src/visitor/image.rs b/src/md/visitor/image.rs
index be49d66..be49d66 100644
--- a/src/visitor/image.rs
+++ b/src/md/visitor/image.rs
diff --git a/src/visitor/linting.rs b/src/md/visitor/linting.rs
index 6266516..d64b03e 100644
--- a/src/visitor/linting.rs
+++ b/src/md/visitor/linting.rs
@@ -1,4 +1,4 @@
-use crate::panhelper;
+use crate::md::panhelper;
use crate::SubplotError;
use pandoc_ast::{Block, MutVisitor};
diff --git a/src/visitor/mod.rs b/src/md/visitor/mod.rs
index 1c095ac..1c095ac 100644
--- a/src/visitor/mod.rs
+++ b/src/md/visitor/mod.rs
diff --git a/src/visitor/structure.rs b/src/md/visitor/structure.rs
index f5693a6..d8faef6 100644
--- a/src/visitor/structure.rs
+++ b/src/md/visitor/structure.rs
@@ -1,4 +1,4 @@
-use crate::panhelper;
+use crate::md::panhelper;
use pandoc_ast::{Block, Inline, MutVisitor};
diff --git a/src/visitor/typesetting.rs b/src/md/visitor/typesetting.rs
index da9c362..2405c03 100644
--- a/src/visitor/typesetting.rs
+++ b/src/md/visitor/typesetting.rs
@@ -1,5 +1,5 @@
-use crate::panhelper;
-use crate::typeset;
+use crate::md::panhelper;
+use crate::md::typeset;
use crate::{Bindings, Style, Warnings};
use pandoc_ast::{Block, Inline, MutVisitor};