From 929f4d64fef8054cbaf34d556467a7d2b9d09b47 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Wed, 21 Jul 2021 12:27:40 +0200 Subject: Switch Loader from Option to io::Result --- src/eval/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/eval') diff --git a/src/eval/mod.rs b/src/eval/mod.rs index 9ec33b13..34986ffa 100644 --- a/src/eval/mod.rs +++ b/src/eval/mod.rs @@ -86,7 +86,7 @@ impl<'a> EvalContext<'a> { /// Generates an error if the file is not found. pub fn resolve(&mut self, path: &str, span: Span) -> Option { let base = *self.route.last()?; - self.loader.resolve_from(base, Path::new(path)).or_else(|| { + self.loader.resolve_from(base, Path::new(path)).ok().or_else(|| { self.diag(error!(span, "file not found")); None }) @@ -107,7 +107,7 @@ impl<'a> EvalContext<'a> { return Some(id); } - let buffer = self.loader.load_file(id).or_else(|| { + let buffer = self.loader.load_file(id).ok().or_else(|| { self.diag(error!(span, "failed to load file")); None })?; -- cgit v1.2.3