diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs index c9a09ef2..e74a30ad 100644 --- a/src/snapshot_middleware/csv.rs +++ b/src/snapshot_middleware/csv.rs @@ -23,7 +23,7 @@ impl SnapshotMiddleware for SnapshotCsv { _context: &mut InstanceSnapshotContext, vfs: &Vfs, entry: &VfsEntry, - ) -> SnapshotInstanceResult<'static> { + ) -> SnapshotInstanceResult { if entry.is_directory() { return Ok(None); } diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs index 63303717..eefff70c 100644 --- a/src/snapshot_middleware/dir.rs +++ b/src/snapshot_middleware/dir.rs @@ -22,7 +22,7 @@ impl SnapshotMiddleware for SnapshotDir { context: &mut InstanceSnapshotContext, vfs: &Vfs, entry: &VfsEntry, - ) -> SnapshotInstanceResult<'static> { + ) -> SnapshotInstanceResult { if entry.is_file() { return Ok(None); } diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs index 737c8bf5..5bead69d 100644 --- a/src/snapshot_middleware/json_model.rs +++ b/src/snapshot_middleware/json_model.rs @@ -22,7 +22,7 @@ impl SnapshotMiddleware for SnapshotJsonModel { _context: &mut InstanceSnapshotContext, vfs: &Vfs, entry: &VfsEntry, - ) -> SnapshotInstanceResult<'static> { + ) -> SnapshotInstanceResult { if entry.is_directory() { return Ok(None); } diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs index d5239cb3..d632c941 100644 --- a/src/snapshot_middleware/lua.rs +++ b/src/snapshot_middleware/lua.rs @@ -23,7 +23,7 @@ impl SnapshotMiddleware for SnapshotLua { context: &mut InstanceSnapshotContext, vfs: &Vfs, entry: &VfsEntry, - ) -> SnapshotInstanceResult<'static> { + ) -> SnapshotInstanceResult { let file_name = entry.path().file_name().unwrap().to_string_lossy(); // These paths alter their parent instance, so we don't need to turn @@ -55,10 +55,7 @@ impl SnapshotMiddleware for SnapshotLua { } /// Core routine for turning Lua files into snapshots. -fn snapshot_lua_file( - vfs: &Vfs, - entry: &VfsEntry, -) -> SnapshotInstanceResult<'static> { +fn snapshot_lua_file(vfs: &Vfs, entry: &VfsEntry) -> SnapshotInstanceResult { let file_name = entry.path().file_name().unwrap().to_string_lossy(); let (class_name, instance_name) = if let Some(name) = match_trailing(&file_name, ".server.lua") @@ -122,7 +119,7 @@ fn snapshot_init( vfs: &Vfs, folder_entry: &VfsEntry, init_name: &str, -) -> SnapshotInstanceResult<'static> { +) -> SnapshotInstanceResult { let init_path = folder_entry.path().join(init_name); if let Some(init_entry) = vfs.get(init_path).with_not_found()? { diff --git a/src/snapshot_middleware/middleware.rs b/src/snapshot_middleware/middleware.rs index b77ff15b..c62892e7 100644 --- a/src/snapshot_middleware/middleware.rs +++ b/src/snapshot_middleware/middleware.rs @@ -7,7 +7,7 @@ use crate::{ use super::{context::InstanceSnapshotContext, error::SnapshotError}; -pub type SnapshotInstanceResult<'a> = Result, SnapshotError>; +pub type SnapshotInstanceResult = Result, SnapshotError>; pub type SnapshotFileResult = Option<(String, VfsSnapshot)>; pub trait SnapshotMiddleware { @@ -15,7 +15,7 @@ pub trait SnapshotMiddleware { context: &mut InstanceSnapshotContext, vfs: &Vfs, entry: &VfsEntry, - ) -> SnapshotInstanceResult<'static>; + ) -> SnapshotInstanceResult; fn from_instance(_tree: &RbxTree, _id: RbxId) -> SnapshotFileResult { None diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs index 6c3174e9..6f018914 100644 --- a/src/snapshot_middleware/mod.rs +++ b/src/snapshot_middleware/mod.rs @@ -48,7 +48,7 @@ macro_rules! middlewares { context: &mut InstanceSnapshotContext, vfs: &Vfs, entry: &VfsEntry, - ) -> SnapshotInstanceResult<'static> { + ) -> SnapshotInstanceResult { $( log::trace!("trying middleware {} on {}", stringify!($middleware), entry.path().display()); diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs index 91ed6ccb..7f6b5018 100644 --- a/src/snapshot_middleware/project.rs +++ b/src/snapshot_middleware/project.rs @@ -25,7 +25,7 @@ impl SnapshotMiddleware for SnapshotProject { context: &mut InstanceSnapshotContext, vfs: &Vfs, entry: &VfsEntry, - ) -> SnapshotInstanceResult<'static> { + ) -> SnapshotInstanceResult { if entry.is_directory() { let project_path = entry.path().join("default.project.json"); @@ -81,7 +81,7 @@ pub fn snapshot_project_node( instance_name: &str, node: &ProjectNode, vfs: &Vfs, -) -> SnapshotInstanceResult<'static> { +) -> SnapshotInstanceResult { let name = Cow::Owned(instance_name.to_owned()); let mut class_name = node .class_name diff --git a/src/snapshot_middleware/rbxlx.rs b/src/snapshot_middleware/rbxlx.rs index 2935fad4..ed4d578c 100644 --- a/src/snapshot_middleware/rbxlx.rs +++ b/src/snapshot_middleware/rbxlx.rs @@ -18,7 +18,7 @@ impl SnapshotMiddleware for SnapshotRbxlx { _context: &mut InstanceSnapshotContext, vfs: &Vfs, entry: &VfsEntry, - ) -> SnapshotInstanceResult<'static> { + ) -> SnapshotInstanceResult { if entry.is_directory() { return Ok(None); } diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs index ec9b4ab1..825e9036 100644 --- a/src/snapshot_middleware/rbxm.rs +++ b/src/snapshot_middleware/rbxm.rs @@ -20,7 +20,7 @@ impl SnapshotMiddleware for SnapshotRbxm { _context: &mut InstanceSnapshotContext, vfs: &Vfs, entry: &VfsEntry, - ) -> SnapshotInstanceResult<'static> { + ) -> SnapshotInstanceResult { if entry.is_directory() { return Ok(None); } diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs index e7b05752..8d0faef3 100644 --- a/src/snapshot_middleware/rbxmx.rs +++ b/src/snapshot_middleware/rbxmx.rs @@ -18,7 +18,7 @@ impl SnapshotMiddleware for SnapshotRbxmx { _context: &mut InstanceSnapshotContext, vfs: &Vfs, entry: &VfsEntry, - ) -> SnapshotInstanceResult<'static> { + ) -> SnapshotInstanceResult { if entry.is_directory() { return Ok(None); } diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs index 54b08aa6..bf1b55d0 100644 --- a/src/snapshot_middleware/txt.rs +++ b/src/snapshot_middleware/txt.rs @@ -23,7 +23,7 @@ impl SnapshotMiddleware for SnapshotTxt { _context: &mut InstanceSnapshotContext, vfs: &Vfs, entry: &VfsEntry, - ) -> SnapshotInstanceResult<'static> { + ) -> SnapshotInstanceResult { if entry.is_directory() { return Ok(None); } diff --git a/src/snapshot_middleware/user_plugins.rs b/src/snapshot_middleware/user_plugins.rs index 10daecd4..31d78275 100644 --- a/src/snapshot_middleware/user_plugins.rs +++ b/src/snapshot_middleware/user_plugins.rs @@ -18,7 +18,7 @@ impl SnapshotMiddleware for SnapshotUserPlugins { context: &mut InstanceSnapshotContext, _vfs: &Vfs, _entry: &VfsEntry, - ) -> SnapshotInstanceResult<'static> { + ) -> SnapshotInstanceResult { // User plugins are only enabled if present on the snapshot context. let plugin_context = match &mut context.plugin_context { Some(ctx) => ctx,