summaryrefslogtreecommitdiff
path: root/src/metadata.rs
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2021-08-22 13:21:55 +0100
committerDaniel Silverstone <dsilvers@digital-scurf.org>2021-09-07 17:32:20 +0100
commitdd97ce7e9ddf146e70d0d7d966f001c64d8b03a5 (patch)
treee589e55ee1711744cdb3418e52647e958b1c2186 /src/metadata.rs
parentd5c69db746b5c4ba938248a7d1c285256c6e6412 (diff)
downloadsubplot-dd97ce7e9ddf146e70d0d7d966f001c64d8b03a5.tar.gz
core: Adjust behaviour for bindings and function file finding
From now on, we search $ common/$ then template/$ and as such we will find common (polyglot) bindings automatically Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
Diffstat (limited to 'src/metadata.rs')
-rw-r--r--src/metadata.rs18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/metadata.rs b/src/metadata.rs
index 3fd2f08..4542c09 100644
--- a/src/metadata.rs
+++ b/src/metadata.rs
@@ -33,8 +33,8 @@ impl Metadata {
{
let title = get_title(&doc.meta);
let date = get_date(&doc.meta);
- let bindings_filenames = get_bindings_filenames(basedir.as_ref(), &doc.meta);
- let functions_filenames = get_functions_filenames(basedir.as_ref(), &doc.meta);
+ let bindings_filenames = get_bindings_filenames(&doc.meta);
+ let functions_filenames = get_functions_filenames(&doc.meta);
let bibliographies = get_bibliographies(basedir.as_ref(), &doc.meta);
let classes = get_classes(&doc.meta);
event!(
@@ -128,18 +128,12 @@ fn get_date(map: &Mapp) -> Option<String> {
get_string(map, "date")
}
-fn get_bindings_filenames<P>(basedir: P, map: &Mapp) -> Vec<PathBuf>
-where
- P: AsRef<Path>,
-{
- get_paths(basedir, map, "bindings")
+fn get_bindings_filenames(map: &Mapp) -> Vec<PathBuf> {
+ get_paths("", map, "bindings")
}
-fn get_functions_filenames<P>(basedir: P, map: &Mapp) -> Vec<PathBuf>
-where
- P: AsRef<Path>,
-{
- get_paths(basedir, map, "functions")
+fn get_functions_filenames(map: &Mapp) -> Vec<PathBuf> {
+ get_paths("", map, "functions")
}
fn get_template_spec(map: &Mapp) -> Result<Option<(String, TemplateSpec)>> {