chore: Simplify to use resource::read_as_string

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>

1 files changed, 3 insertions, 10 deletions

diff --git a/src/codegen.rs b/src/codegen.rs
index f436a34..063f8a2 100644
--- a/src/codegen.rs
+++ b/src/codegen.rs
@@ -1,7 +1,7 @@
 use crate::{resource, Document, SubplotError, TemplateSpec};
 use std::collections::HashMap;
 use std::fs::File;
-use std::io::prelude::{Read, Write};
+use std::io::Write;
 use std::path::{Path, PathBuf};
 
 use base64::encode;
@@ -52,8 +52,8 @@ fn context(doc: &mut Document) -> Result<Context> {
     let funcs_filenames = doc.meta().functions_filenames();
     let mut funcs = vec![];
     for filename in funcs_filenames {
-        let content =
-            cat(filename).map_err(|e| SubplotError::FunctionsFileNotFound(filename.into(), e))?;
+        let content = resource::read_as_string(filename)
+            .map_err(|e| SubplotError::FunctionsFileNotFound(filename.into(), e.into()))?;
         funcs.push(Func::new(filename, content));
     }
     context.insert("functions", &funcs);
@@ -73,13 +73,6 @@ fn tera(tmplspec: &TemplateSpec) -> Result<Tera> {
     Ok(tera)
 }
 
-fn cat<P: AsRef<Path>>(filename: P) -> Result<String> {
-    let mut f = resource::open(filename)?;
-    let mut buf = String::new();
-    f.read_to_string(&mut buf)?;
-    Ok(buf)
-}
-
 fn write(filename: &Path, content: &str) -> Result<()> {
     let mut f: File = File::create(filename)?;
     f.write_all(&content.as_bytes())?;