Removed InstanceSnapshot snapshot_id's redudant Ref. (#730)

Ref now is an optional inside, so it's redundant to have an option wrapping an option. The only snapshots that were changed were any that had a Ref within (from none to zeroed). Some also had some newlines added in the end.
2026-04-23 22:25:26 +00:00 · 2023-07-12 13:00:09 -04:00
parent 623fa06d52
commit 80eb14f9da
29 changed files with 58 additions and 69 deletions
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -2,7 +2,7 @@ use std::{borrow::Cow, collections::HashMap, path::Path, str};

 use anyhow::Context;
 use memofs::Vfs;
-use rbx_dom_weak::types::Attributes;
+use rbx_dom_weak::types::{Attributes, Ref};
 use serde::Deserialize;

 use crate::{
@@ -112,7 +112,7 @@ impl JsonModel {
        }

        Ok(InstanceSnapshot {
-            snapshot_id: None,
+            snapshot_id: Ref::none(),
            metadata: Default::default(),
            name: Cow::Owned(name),
            class_name: Cow::Owned(class_name),
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -2,7 +2,7 @@ use std::{borrow::Cow, collections::HashMap, path::Path};

 use anyhow::{bail, Context};
 use memofs::Vfs;
-use rbx_dom_weak::types::Attributes;
+use rbx_dom_weak::types::{Attributes, Ref};
 use rbx_reflection::ClassTag;

 use crate::{
@@ -271,7 +271,7 @@ pub fn snapshot_project_node(
    ));

    Ok(Some(InstanceSnapshot {
-        snapshot_id: None,
+        snapshot_id: Ref::none(),
        name,
        class_name,
        properties,
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewarecsvtest__csv_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewarecsvtest__csv_from_vfs.snap
@@ -1,9 +1,8 @@
 ---
 source: src/snapshot_middleware/csv.rs
 expression: instance_snapshot
-
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: false
  instigating_source:
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewarecsvtest__csv_with_meta.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewarecsvtest__csv_with_meta.snap
@@ -1,9 +1,8 @@
 ---
 source: src/snapshot_middleware/csv.rs
 expression: instance_snapshot
-
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: true
  instigating_source:
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewaredirtest__empty_folder.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewaredirtest__empty_folder.snap
@@ -1,9 +1,8 @@
 ---
 source: src/snapshot_middleware/dir.rs
-assertion_line: 127
 expression: instance_snapshot
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: false
  instigating_source:
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewaredirtest__folder_in_folder.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewaredirtest__folder_in_folder.snap
@@ -1,9 +1,8 @@
 ---
 source: src/snapshot_middleware/dir.rs
-assertion_line: 148
 expression: instance_snapshot
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: false
  instigating_source:
@@ -23,7 +22,7 @@ name: foo
 class_name: Folder
 properties: {}
 children:
-  - snapshot_id: ~
+  - snapshot_id: "00000000000000000000000000000000"
    metadata:
      ignore_unknown_instances: false
      instigating_source:
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewarejsontest__instance_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewarejsontest__instance_from_vfs.snap
@@ -1,9 +1,8 @@
 ---
 source: src/snapshot_middleware/json.rs
 expression: instance_snapshot
-
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: false
  instigating_source:
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json_modeltestmodel_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json_modeltestmodel_from_vfs.snap
@@ -1,9 +1,8 @@
 ---
 source: src/snapshot_middleware/json_model.rs
 expression: instance_snapshot
-
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: false
  instigating_source:
@@ -17,7 +16,7 @@ properties:
  Value:
    Int64: 5
 children:
-  - snapshot_id: ~
+  - snapshot_id: "00000000000000000000000000000000"
    metadata:
      ignore_unknown_instances: false
      relevant_paths: []
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json_modeltestmodel_from_vfs_legacy.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json_modeltestmodel_from_vfs_legacy.snap
@@ -1,9 +1,8 @@
 ---
 source: src/snapshot_middleware/json_model.rs
-assertion_line: 186
 expression: instance_snapshot
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: false
  instigating_source:
@@ -17,7 +16,7 @@ properties:
  Value:
    Int64: 5
 children:
-  - snapshot_id: ~
+  - snapshot_id: "00000000000000000000000000000000"
    metadata:
      ignore_unknown_instances: false
      relevant_paths: []
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareluatest__client_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareluatest__client_from_vfs.snap
@@ -1,9 +1,8 @@
 ---
 source: src/snapshot_middleware/lua.rs
 expression: instance_snapshot
-
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: false
  instigating_source:
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareluatest__module_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareluatest__module_from_vfs.snap
@@ -1,9 +1,8 @@
 ---
 source: src/snapshot_middleware/lua.rs
 expression: instance_snapshot
-
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: false
  instigating_source:
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareluatest__module_with_meta.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareluatest__module_with_meta.snap
@@ -1,9 +1,8 @@
 ---
 source: src/snapshot_middleware/lua.rs
 expression: instance_snapshot
-
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: true
  instigating_source:
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareluatest__script_disabled.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareluatest__script_disabled.snap
@@ -1,9 +1,8 @@
 ---
 source: src/snapshot_middleware/lua.rs
 expression: instance_snapshot
-
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: false
  instigating_source:
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareluatest__script_with_meta.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareluatest__script_with_meta.snap
@@ -1,9 +1,8 @@
 ---
 source: src/snapshot_middleware/lua.rs
 expression: instance_snapshot
-
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: true
  instigating_source:
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareluatest__server_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareluatest__server_from_vfs.snap
@@ -1,9 +1,8 @@
 ---
 source: src/snapshot_middleware/lua.rs
 expression: instance_snapshot
-
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: false
  instigating_source:
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareprojecttest__project_from_direct_file.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareprojecttest__project_from_direct_file.snap
@@ -2,7 +2,7 @@
 source: src/snapshot_middleware/project.rs
 expression: instance_snapshot
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: true
  instigating_source:
@@ -14,3 +14,4 @@ name: direct-project
 class_name: Model
 properties: {}
 children: []
+
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareprojecttest__project_path_property_overrides.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareprojecttest__project_path_property_overrides.snap
@@ -1,9 +1,8 @@
 ---
 source: src/snapshot_middleware/project.rs
 expression: instance_snapshot
-
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: true
  instigating_source:
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareprojecttest__project_with_children.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareprojecttest__project_with_children.snap
@@ -2,7 +2,7 @@
 source: src/snapshot_middleware/project.rs
 expression: instance_snapshot
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: true
  instigating_source:
@@ -14,7 +14,7 @@ name: children
 class_name: Folder
 properties: {}
 children:
-  - snapshot_id: ~
+  - snapshot_id: "00000000000000000000000000000000"
    metadata:
      ignore_unknown_instances: true
      instigating_source:
@@ -29,3 +29,4 @@ children:
    class_name: Model
    properties: {}
    children: []
+
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareprojecttest__project_with_path_to_project.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareprojecttest__project_with_path_to_project.snap
@@ -2,7 +2,7 @@
 source: src/snapshot_middleware/project.rs
 expression: instance_snapshot
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: true
  instigating_source:
@@ -15,3 +15,4 @@ name: path-project
 class_name: Model
 properties: {}
 children: []
+
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareprojecttest__project_with_path_to_project_with_children.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareprojecttest__project_with_path_to_project_with_children.snap
@@ -2,7 +2,7 @@
 source: src/snapshot_middleware/project.rs
 expression: instance_snapshot
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: true
  instigating_source:
@@ -15,7 +15,7 @@ name: path-child-project
 class_name: Folder
 properties: {}
 children:
-  - snapshot_id: ~
+  - snapshot_id: "00000000000000000000000000000000"
    metadata:
      ignore_unknown_instances: true
      instigating_source:
@@ -30,3 +30,4 @@ children:
    class_name: Model
    properties: {}
    children: []
+
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareprojecttest__project_with_path_to_txt.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareprojecttest__project_with_path_to_txt.snap
@@ -1,9 +1,8 @@
 ---
 source: src/snapshot_middleware/project.rs
 expression: instance_snapshot
-
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: false
  instigating_source:
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareprojecttest__project_with_resolved_properties.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareprojecttest__project_with_resolved_properties.snap
@@ -1,9 +1,8 @@
 ---
 source: src/snapshot_middleware/project.rs
 expression: instance_snapshot
-
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: true
  instigating_source:
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareprojecttest__project_with_unresolved_properties.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewareprojecttest__project_with_unresolved_properties.snap
@@ -1,9 +1,8 @@
 ---
 source: src/snapshot_middleware/project.rs
 expression: instance_snapshot
-
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: true
  instigating_source:
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middlewaretxttest__instance_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middlewaretxttest__instance_from_vfs.snap
@@ -1,9 +1,8 @@
 ---
 source: src/snapshot_middleware/txt.rs
 expression: instance_snapshot
-
 ---
-snapshot_id: ~
+snapshot_id: "00000000000000000000000000000000"
 metadata:
  ignore_unknown_instances: false
  instigating_source: