Introduce EvalAltResult::ErrorSystem.

2020-10-17 16:34:07 +08:00
parent 8eb6c821d4
commit 7a4905209c
4 changed files with 44 additions and 44 deletions
--- a/src/api.rs
+++ b/src/api.rs
@@ -924,13 +924,19 @@ impl Engine {
    #[inline]
    fn read_file(path: PathBuf) -> Result<String, Box<EvalAltResult>> {
        let mut f = File::open(path.clone()).map_err(|err| {
-            EvalAltResult::ErrorReadingScriptFile(path.clone(), Position::none(), err)
+            EvalAltResult::ErrorSystem(
+                format!("Cannot open script file '{}'", path.to_string_lossy()),
+                err.into(),
+            )
        })?;

        let mut contents = String::new();

        f.read_to_string(&mut contents).map_err(|err| {
-            EvalAltResult::ErrorReadingScriptFile(path.clone(), Position::none(), err)
+            EvalAltResult::ErrorSystem(
+                format!("Cannot read script file '{}'", path.to_string_lossy()),
+                err.into(),
+            )
        })?;

        Ok(contents)