diff options
author | Lars Wirzenius <liw@liw.fi> | 2023-06-21 05:35:40 +0300 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2023-06-21 05:35:40 +0300 |
commit | 4694b6e7dcf29a01b47eee4a782e5b585cd80c39 (patch) | |
tree | 6c0e12feeacc6795726ee585625311c95b07d776 /src | |
parent | d8e88bcdf5fddab3757d64cb7ca4c355480a8ca5 (diff) | |
download | subplot-4694b6e7dcf29a01b47eee4a782e5b585cd80c39.tar.gz |
refactor: rename Document::files to ::embedded_files
This makes it more clear what kind of files we're talking about. The
old name could've meant, say, the markdown files.
Sponsored-by: author
Diffstat (limited to 'src')
-rw-r--r-- | src/bin/cli/mod.rs | 4 | ||||
-rw-r--r-- | src/bin/subplot.rs | 2 | ||||
-rw-r--r-- | src/codegen.rs | 2 | ||||
-rw-r--r-- | src/doc.rs | 12 |
4 files changed, 12 insertions, 8 deletions
diff --git a/src/bin/cli/mod.rs b/src/bin/cli/mod.rs index dacf9b6..19e4fbf 100644 --- a/src/bin/cli/mod.rs +++ b/src/bin/cli/mod.rs @@ -13,7 +13,7 @@ use std::{collections::HashMap, convert::TryFrom}; use subplot::{Document, EmbeddedFile, Style, SubplotError}; pub fn extract_file<'a>(doc: &'a Document, filename: &str) -> Result<&'a EmbeddedFile> { - for file in doc.files() { + for file in doc.embedded_files() { if file.filename() == filename { return Ok(file); } @@ -78,7 +78,7 @@ impl TryFrom<&mut Document> for Metadata { .collect(); scenarios.sort_unstable(); let mut files: Vec<_> = doc - .files() + .embedded_files() .iter() .map(|f| f.filename().to_owned()) .collect(); diff --git a/src/bin/subplot.rs b/src/bin/subplot.rs index ced34cc..6c118d4 100644 --- a/src/bin/subplot.rs +++ b/src/bin/subplot.rs @@ -159,7 +159,7 @@ impl Extract { let doc = load_linted_doc(&self.filename, Style::default(), None, self.merciful)?; let files: Vec<&EmbeddedFile> = if self.embedded.is_empty() { - doc.files() + doc.embedded_files() .iter() .map(Result::Ok) .collect::<Result<Vec<_>>>() diff --git a/src/codegen.rs b/src/codegen.rs index 81a5f35..41b5556 100644 --- a/src/codegen.rs +++ b/src/codegen.rs @@ -32,7 +32,7 @@ fn context(doc: &mut Document, template: &str) -> Result<Context, SubplotError> let mut context = Context::new(); let scenarios = doc.matched_scenarios(template)?; context.insert("scenarios", &scenarios); - context.insert("files", doc.files()); + context.insert("files", doc.embedded_files()); let mut funcs = vec![]; if let Some(docimpl) = doc.meta().document_impl(template) { @@ -245,7 +245,7 @@ impl Document { } /// Return list of files embeddedin the document. - pub fn files(&self) -> &[EmbeddedFile] { + pub fn embedded_files(&self) -> &[EmbeddedFile] { self.files.files() } @@ -275,7 +275,11 @@ impl Document { // Check that all filenames for embedded files are unique. fn check_filenames_are_unique(&self) -> Result<(), SubplotError> { let mut known = HashSet::new(); - for filename in self.files().iter().map(|f| f.filename().to_lowercase()) { + for filename in self + .embedded_files() + .iter() + .map(|f| f.filename().to_lowercase()) + { if known.contains(&filename) { return Err(SubplotError::DuplicateEmbeddedFilename(filename)); } @@ -367,7 +371,7 @@ impl Document { warnings: &mut Warnings, ) -> Result<bool, SubplotError> { let filenames: HashSet<_> = self - .files() + .embedded_files() .iter() .map(|f| f.filename().to_lowercase()) .collect(); @@ -404,7 +408,7 @@ impl Document { warnings: &mut Warnings, ) -> Result<bool, SubplotError> { let mut filenames: HashSet<_> = self - .files() + .embedded_files() .iter() .map(|f| f.filename().to_lowercase()) .collect(); |