ari-party/rojo
1
0
Fork 0
forked from rojo-rbx/rojo
Code Pull Requests Activity

Remove lifetime from SnapshotInstanceResult

Browse Source
This commit is contained in:
Lucien Greathouse
2019-11-19 13:06:31 -08:00
parent d2e2a13479
commit 02f98a4053
12 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/snapshot_middleware/lua.rs
View File

@@ -23,7 +23,7 @@ impl SnapshotMiddleware for SnapshotLua {
context: &mut InstanceSnapshotContext,
vfs: &Vfs<F>,
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<F: VfsFetcher>(
vfs: &Vfs<F>,
entry: &VfsEntry,
) -> SnapshotInstanceResult<'static> {
fn snapshot_lua_file<F: VfsFetcher>(vfs: &Vfs<F>, 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<F: VfsFetcher>(
vfs: &Vfs<F>,
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()? {