diff --git a/src/snapshot_middleware/error.rs b/src/snapshot_middleware/error.rs index 2ee268fb..486b8324 100644 --- a/src/snapshot_middleware/error.rs +++ b/src/snapshot_middleware/error.rs @@ -1,6 +1,6 @@ use std::{error::Error, fmt, io, path::PathBuf}; -use crate::{imfs::FsError, snapshot::InstanceSnapshot}; +use crate::imfs::FsError; #[derive(Debug)] pub struct SnapshotError { diff --git a/src/snapshot_middleware/middleware.rs b/src/snapshot_middleware/middleware.rs index 04c6ec94..66c2f673 100644 --- a/src/snapshot_middleware/middleware.rs +++ b/src/snapshot_middleware/middleware.rs @@ -3,11 +3,13 @@ use std::path::{Path, PathBuf}; use rbx_dom_weak::{RbxId, RbxTree}; use crate::{ - imfs::{FsResult, Imfs, ImfsEntry, ImfsFetcher, ImfsSnapshot}, + imfs::{Imfs, ImfsEntry, ImfsFetcher, ImfsSnapshot}, snapshot::InstanceSnapshot, }; -pub type SnapshotInstanceResult<'a> = FsResult>>; +use super::error::SnapshotError; + +pub type SnapshotInstanceResult<'a> = Result>, SnapshotError>; pub type SnapshotFileResult = Option<(String, ImfsSnapshot)>; pub trait SnapshotMiddleware { diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs index b16f3e23..d8cfa355 100644 --- a/src/snapshot_middleware/mod.rs +++ b/src/snapshot_middleware/mod.rs @@ -17,6 +17,8 @@ mod rbxm; mod rbxmx; mod txt; +pub use self::error::*; + use rbx_dom_weak::{RbxId, RbxTree}; use self::{ diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs index 4ea7b267..fadd6f90 100644 --- a/src/snapshot_middleware/project.rs +++ b/src/snapshot_middleware/project.rs @@ -29,7 +29,7 @@ impl SnapshotMiddleware for SnapshotProject { match imfs.get(project_path) { Err(ref err) if err.kind() == FsErrorKind::NotFound => {} - Err(err) => return Err(err), + Err(err) => return Err(err.into()), // TODO: Do we need to muck with the relevant paths if we're a // project file within a folder? Should the folder path be the