diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs index 28876634..0cf16cfc 100644 --- a/src/snapshot_middleware/csv.rs +++ b/src/snapshot_middleware/csv.rs @@ -20,7 +20,7 @@ pub struct SnapshotCsv; impl SnapshotMiddleware for SnapshotCsv { fn from_imfs( - _context: &InstanceSnapshotContext, + _context: &mut InstanceSnapshotContext, imfs: &mut Imfs, entry: &ImfsEntry, ) -> SnapshotInstanceResult<'static> { @@ -162,7 +162,7 @@ Ack,Ack!,,An exclamation of despair,¡Ay!"#, let entry = imfs.get("/foo.csv").unwrap(); let instance_snapshot = - SnapshotCsv::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotCsv::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .unwrap() .unwrap(); @@ -184,7 +184,7 @@ Ack,Ack!,,An exclamation of despair,¡Ay!"#, let entry = imfs.get("/foo.csv").unwrap(); let instance_snapshot = - SnapshotCsv::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotCsv::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .unwrap() .unwrap(); diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs index ba499d26..1c36dc6f 100644 --- a/src/snapshot_middleware/dir.rs +++ b/src/snapshot_middleware/dir.rs @@ -18,7 +18,7 @@ pub struct SnapshotDir; impl SnapshotMiddleware for SnapshotDir { fn from_imfs( - _context: &InstanceSnapshotContext, + _context: &mut InstanceSnapshotContext, imfs: &mut Imfs, entry: &ImfsEntry, ) -> SnapshotInstanceResult<'static> { @@ -97,7 +97,7 @@ mod test { let entry = imfs.get("/foo").unwrap(); let instance_snapshot = - SnapshotDir::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotDir::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .unwrap() .unwrap(); @@ -115,7 +115,7 @@ mod test { let entry = imfs.get("/foo").unwrap(); let instance_snapshot = - SnapshotDir::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotDir::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .unwrap() .unwrap(); diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs index 23631439..accec10f 100644 --- a/src/snapshot_middleware/json_model.rs +++ b/src/snapshot_middleware/json_model.rs @@ -19,7 +19,7 @@ pub struct SnapshotJsonModel; impl SnapshotMiddleware for SnapshotJsonModel { fn from_imfs( - _context: &InstanceSnapshotContext, + _context: &mut InstanceSnapshotContext, imfs: &mut Imfs, entry: &ImfsEntry, ) -> SnapshotInstanceResult<'static> { @@ -163,10 +163,13 @@ mod test { imfs.debug_load_snapshot("/foo.model.json", file); let entry = imfs.get("/foo.model.json").unwrap(); - let instance_snapshot = - SnapshotJsonModel::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) - .unwrap() - .unwrap(); + let instance_snapshot = SnapshotJsonModel::from_imfs( + &mut InstanceSnapshotContext::default(), + &mut imfs, + &entry, + ) + .unwrap() + .unwrap(); assert_yaml_snapshot!(instance_snapshot); } diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs index fc7da815..13df304f 100644 --- a/src/snapshot_middleware/lua.rs +++ b/src/snapshot_middleware/lua.rs @@ -20,7 +20,7 @@ pub struct SnapshotLua; impl SnapshotMiddleware for SnapshotLua { fn from_imfs( - context: &InstanceSnapshotContext, + context: &mut InstanceSnapshotContext, imfs: &mut Imfs, entry: &ImfsEntry, ) -> SnapshotInstanceResult<'static> { @@ -116,7 +116,7 @@ fn snapshot_lua_file( /// Scripts named `init.lua`, `init.server.lua`, or `init.client.lua` usurp /// their parents, which acts similarly to `__init__.py` from the Python world. fn snapshot_init( - context: &InstanceSnapshotContext, + context: &mut InstanceSnapshotContext, imfs: &mut Imfs, folder_entry: &ImfsEntry, init_name: &str, @@ -156,7 +156,7 @@ mod test { let entry = imfs.get("/foo.lua").unwrap(); let instance_snapshot = - SnapshotLua::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotLua::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .unwrap() .unwrap(); @@ -172,7 +172,7 @@ mod test { let entry = imfs.get("/foo.server.lua").unwrap(); let instance_snapshot = - SnapshotLua::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotLua::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .unwrap() .unwrap(); @@ -188,7 +188,7 @@ mod test { let entry = imfs.get("/foo.client.lua").unwrap(); let instance_snapshot = - SnapshotLua::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotLua::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .unwrap() .unwrap(); @@ -212,7 +212,7 @@ mod test { let entry = imfs.get("/foo.lua").unwrap(); let instance_snapshot = - SnapshotLua::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotLua::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .unwrap() .unwrap(); @@ -236,7 +236,7 @@ mod test { let entry = imfs.get("/foo.server.lua").unwrap(); let instance_snapshot = - SnapshotLua::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotLua::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .unwrap() .unwrap(); @@ -262,7 +262,7 @@ mod test { let entry = imfs.get("/bar.server.lua").unwrap(); let instance_snapshot = - SnapshotLua::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotLua::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .unwrap() .unwrap(); diff --git a/src/snapshot_middleware/middleware.rs b/src/snapshot_middleware/middleware.rs index 5b4d96c8..08c24df6 100644 --- a/src/snapshot_middleware/middleware.rs +++ b/src/snapshot_middleware/middleware.rs @@ -14,7 +14,7 @@ pub type SnapshotFileResult = Option<(String, ImfsSnapshot)>; pub trait SnapshotMiddleware { fn from_imfs( - context: &InstanceSnapshotContext, + context: &mut InstanceSnapshotContext, imfs: &mut Imfs, entry: &ImfsEntry, ) -> SnapshotInstanceResult<'static>; diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs index dae68d5a..26968482 100644 --- a/src/snapshot_middleware/mod.rs +++ b/src/snapshot_middleware/mod.rs @@ -44,12 +44,12 @@ macro_rules! middlewares { imfs: &mut Imfs, entry: &ImfsEntry, ) -> SnapshotInstanceResult<'static> { - let context = InstanceSnapshotContext::default(); + let mut context = InstanceSnapshotContext::default(); $( log::trace!("trying middleware {} on {}", stringify!($middleware), entry.path().display()); - if let Some(snapshot) = $middleware::from_imfs(&context, imfs, entry)? { + if let Some(snapshot) = $middleware::from_imfs(&mut context, imfs, entry)? { log::trace!("middleware {} success on {}", stringify!($middleware), entry.path().display()); return Ok(Some(snapshot)); } diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs index 7266c398..d1e0d9f4 100644 --- a/src/snapshot_middleware/project.rs +++ b/src/snapshot_middleware/project.rs @@ -22,7 +22,7 @@ pub struct SnapshotProject; impl SnapshotMiddleware for SnapshotProject { fn from_imfs( - context: &InstanceSnapshotContext, + context: &mut InstanceSnapshotContext, imfs: &mut Imfs, entry: &ImfsEntry, ) -> SnapshotInstanceResult<'static> { @@ -212,7 +212,7 @@ mod test { let entry = imfs.get("/foo").unwrap(); let instance_snapshot = - SnapshotProject::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotProject::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .expect("snapshot error") .expect("snapshot returned no instances"); @@ -239,7 +239,7 @@ mod test { let entry = imfs.get("/foo/hello.project.json").unwrap(); let instance_snapshot = - SnapshotProject::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotProject::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .expect("snapshot error") .expect("snapshot returned no instances"); @@ -272,7 +272,7 @@ mod test { let entry = imfs.get("/foo").unwrap(); let instance_snapshot = - SnapshotProject::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotProject::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .expect("snapshot error") .expect("snapshot returned no instances"); @@ -302,7 +302,7 @@ mod test { let entry = imfs.get("/foo").unwrap(); let instance_snapshot = - SnapshotProject::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotProject::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .expect("snapshot error") .expect("snapshot returned no instances"); @@ -333,7 +333,7 @@ mod test { let entry = imfs.get("/foo").unwrap(); let instance_snapshot = - SnapshotProject::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotProject::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .expect("snapshot error") .expect("snapshot returned no instances"); @@ -361,7 +361,7 @@ mod test { let entry = imfs.get("/foo").unwrap(); let instance_snapshot = - SnapshotProject::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotProject::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .expect("snapshot error") .expect("snapshot returned no instances"); @@ -396,7 +396,7 @@ mod test { let entry = imfs.get("/foo").unwrap(); let instance_snapshot = - SnapshotProject::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotProject::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .expect("snapshot error") .expect("snapshot returned no instances"); @@ -435,7 +435,7 @@ mod test { let entry = imfs.get("/foo").unwrap(); let instance_snapshot = - SnapshotProject::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotProject::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .expect("snapshot error") .expect("snapshot returned no instances"); @@ -479,7 +479,7 @@ mod test { let entry = imfs.get("/foo").unwrap(); let instance_snapshot = - SnapshotProject::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotProject::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .expect("snapshot error") .expect("snapshot returned no instances"); diff --git a/src/snapshot_middleware/rbxlx.rs b/src/snapshot_middleware/rbxlx.rs index f5e610df..531ef4d8 100644 --- a/src/snapshot_middleware/rbxlx.rs +++ b/src/snapshot_middleware/rbxlx.rs @@ -15,7 +15,7 @@ pub struct SnapshotRbxlx; impl SnapshotMiddleware for SnapshotRbxlx { fn from_imfs( - _context: &InstanceSnapshotContext, + _context: &mut InstanceSnapshotContext, imfs: &mut Imfs, entry: &ImfsEntry, ) -> SnapshotInstanceResult<'static> { diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs index 2a1d910a..7d11751a 100644 --- a/src/snapshot_middleware/rbxm.rs +++ b/src/snapshot_middleware/rbxm.rs @@ -17,7 +17,7 @@ pub struct SnapshotRbxm; impl SnapshotMiddleware for SnapshotRbxm { fn from_imfs( - _context: &InstanceSnapshotContext, + _context: &mut InstanceSnapshotContext, imfs: &mut Imfs, entry: &ImfsEntry, ) -> SnapshotInstanceResult<'static> { @@ -71,7 +71,7 @@ mod test { let entry = imfs.get("/foo.rbxm").unwrap(); let instance_snapshot = - SnapshotRbxm::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotRbxm::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .unwrap() .unwrap(); diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs index 8e29cd9c..663c2f0d 100644 --- a/src/snapshot_middleware/rbxmx.rs +++ b/src/snapshot_middleware/rbxmx.rs @@ -15,7 +15,7 @@ pub struct SnapshotRbxmx; impl SnapshotMiddleware for SnapshotRbxmx { fn from_imfs( - _context: &InstanceSnapshotContext, + _context: &mut InstanceSnapshotContext, imfs: &mut Imfs, entry: &ImfsEntry, ) -> SnapshotInstanceResult<'static> { @@ -77,7 +77,7 @@ mod test { let entry = imfs.get("/foo.rbxmx").unwrap(); let instance_snapshot = - SnapshotRbxmx::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotRbxmx::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .unwrap() .unwrap(); diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs index 4d952041..11584d15 100644 --- a/src/snapshot_middleware/txt.rs +++ b/src/snapshot_middleware/txt.rs @@ -20,7 +20,7 @@ pub struct SnapshotTxt; impl SnapshotMiddleware for SnapshotTxt { fn from_imfs( - _context: &InstanceSnapshotContext, + _context: &mut InstanceSnapshotContext, imfs: &mut Imfs, entry: &ImfsEntry, ) -> SnapshotInstanceResult<'static> { @@ -117,7 +117,7 @@ mod test { let entry = imfs.get("/foo.txt").unwrap(); let instance_snapshot = - SnapshotTxt::from_imfs(&InstanceSnapshotContext::default(), &mut imfs, &entry) + SnapshotTxt::from_imfs(&mut InstanceSnapshotContext::default(), &mut imfs, &entry) .unwrap() .unwrap();