diff options
author | Daniel Silverstone <dsilvers+gitlab@digital-scurf.org> | 2020-06-06 14:42:54 +0000 |
---|---|---|
committer | Daniel Silverstone <dsilvers+gitlab@digital-scurf.org> | 2020-06-06 14:42:54 +0000 |
commit | bba22e1f86967feebf94ebac327f7489c1029afd (patch) | |
tree | 4bf73ddfb8ed42cb507fbb98e17343d7fff10ce3 /src/codegen.rs | |
parent | 40f3c837310456aaca480a817eb0b6d5e6577b90 (diff) | |
parent | 95bc7f84bbe909c69783f9ae379af2230ddc0739 (diff) | |
download | subplot-bba22e1f86967feebf94ebac327f7489c1029afd.tar.gz |
Merge branch 'enoent' into 'master'
fix: report name of missing bindings or functions file in error msg
Closes #63
See merge request larswirzenius/subplot!47
Diffstat (limited to 'src/codegen.rs')
-rw-r--r-- | src/codegen.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/codegen.rs b/src/codegen.rs index db31765..9895783 100644 --- a/src/codegen.rs +++ b/src/codegen.rs @@ -1,4 +1,4 @@ -use crate::{Document, TemplateSpec}; +use crate::{Document, SubplotError, TemplateSpec}; use std::collections::HashMap; use std::fs::File; use std::io::prelude::{Read, Write}; @@ -44,7 +44,9 @@ fn context(doc: &mut Document) -> Result<Context> { let funcs_filenames = doc.meta().functions_filenames(); let mut funcs = String::new(); for filename in funcs_filenames { - funcs.push_str(&cat(filename)?); + let content = + cat(filename).map_err(|e| SubplotError::FunctionsFileNotFound(filename.into(), e))?; + funcs.push_str(&content); } context.insert("functions", &funcs); |