Switch Loader from Option to io::Result

1 files changed, 8 insertions, 5 deletions

diff --git a/src/loading/fs.rs b/src/loading/fs.rs
index 407e2d94..0f6f1076 100644
--- a/src/loading/fs.rs
+++ b/src/loading/fs.rs
@@ -187,13 +187,16 @@ impl Loader for FsLoader {
         &self.faces
     }
 
-    fn resolve_from(&self, base: FileId, path: &Path) -> Option<FileId> {
-        let full = self.paths.borrow()[&base].parent()?.join(path);
-        self.resolve(&full).ok()
+    fn resolve_from(&self, base: FileId, path: &Path) -> io::Result<FileId> {
+        let full = self.paths.borrow()[&base]
+            .parent()
+            .expect("base is a file")
+            .join(path);
+        self.resolve(&full)
     }
 
-    fn load_file(&self, id: FileId) -> Option<Vec<u8>> {
-        fs::read(&self.paths.borrow()[&id]).ok()
+    fn load_file(&self, id: FileId) -> io::Result<Vec<u8>> {
+        fs::read(&self.paths.borrow()[&id])
     }
 }