diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_info.snap index 26f9b26b..892f5678 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_info.snap index d569c431..5bbf7af8 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_info.snap index 48debb8f..1e225fd5 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_json_model_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_json_model_info.snap index 45a4d520..a93af1c0 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_json_model_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_json_model_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__forced_parent_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__forced_parent_info.snap index 56dec80f..6dd70e45 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__forced_parent_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__forced_parent_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__meshpart_with_id_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__meshpart_with_id_info.snap index 0e8f3938..ec295b83 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__meshpart_with_id_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__meshpart_with_id_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap index 217a10b8..ce5f5eb5 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_default_project_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_default_project_info.snap index b5ff4210..476d7518 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_default_project_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_default_project_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_project_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_project_info.snap index c801548f..b3b665c0 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_project_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_project_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_top_level_project_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_top_level_project_info.snap index 584ef5b9..a12222ec 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_top_level_project_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_top_level_project_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__pivot_migration_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__pivot_migration_info.snap index 7397ac83..9ab5279b 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__pivot_migration_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__pivot_migration_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_info.snap index b99e522e..d4ab304f 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_patch_update_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_patch_update_info.snap index b99e522e..d4ab304f 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_patch_update_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_patch_update_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_info.snap index d7bdfd9f..6fa9af9a 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_info.snap index b833d37f..482b8fb4 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_info.snap index 652868f1..07fad8b1 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_alone_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_alone_info.snap index 40d16b7f..fb82f968 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_alone_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_alone_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_complex_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_complex_info.snap index 45c023e9..8e6e0cca 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_complex_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_complex_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_no_extension_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_no_extension_info.snap index 2e1575f2..b87995c3 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_no_extension_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_no_extension_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_no_name_project_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_no_name_project_info.snap index fb65afa3..0788b66d 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_no_name_project_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_no_name_project_info.snap @@ -12,7 +12,6 @@ syncSourceOnly: true visibleServices: - Lighting - MaterialService - - NetworkClient - ReplicatedFirst - ReplicatedStorage - ServerScriptService diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs index 8d360915..f96f88cd 100644 --- a/src/snapshot_middleware/project.rs +++ b/src/snapshot_middleware/project.rs @@ -70,10 +70,13 @@ fn middleware_for_script(inst: &Instance) -> Middleware { .and_then(|db| db.enums.get("RunContext")) .map(|e| &e.items); - let run_context_value = inst.properties.get(&ustr("RunContext")).and_then(|v| match v { - Variant::Enum(e) => Some(e.to_u32()), - _ => None, - }); + let run_context_value = inst + .properties + .get(&ustr("RunContext")) + .and_then(|v| match v { + Variant::Enum(e) => Some(e.to_u32()), + _ => None, + }); if let (Some(enums), Some(value)) = (run_context_enums, run_context_value) { for (name, &enum_value) in enums { diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs index 1d81b934..e02e0995 100644 --- a/src/snapshot_middleware/rbxm.rs +++ b/src/snapshot_middleware/rbxm.rs @@ -75,7 +75,11 @@ pub fn syncback_rbxm<'sync>( /// Clones a subtree from the source WeakDom, filtering out instances that match /// the provided ignoreTrees glob patterns. /// Each entry contains both the compiled Glob and the original pattern string. -pub fn clone_tree_filtered(source: &WeakDom, root_ref: Ref, ignore_globs: &[(Glob, String)]) -> WeakDom { +pub fn clone_tree_filtered( + source: &WeakDom, + root_ref: Ref, + ignore_globs: &[(Glob, String)], +) -> WeakDom { let root_inst = source.get_by_ref(root_ref).expect("root ref should exist"); // Create a new tree with the root instance @@ -104,7 +108,9 @@ fn add_children_filtered( let child_path = inst_path(source, child_ref); // Check if this child should be ignored - let should_ignore = ignore_globs.iter().any(|(glob, _)| glob.is_match(&child_path)); + let should_ignore = ignore_globs + .iter() + .any(|(glob, _)| glob.is_match(&child_path)); if should_ignore { log::debug!("Filtering out {child_path} from rbxm due to ignoreTrees pattern"); diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs index b90e2a4d..9a7c17ea 100644 --- a/src/syncback/mod.rs +++ b/src/syncback/mod.rs @@ -342,9 +342,11 @@ pub fn syncback_loop_with_stats( let path = source.path(); if !path.to_string_lossy().ends_with(".project.json5") && !path.to_string_lossy().ends_with(".project.json") - && path.exists() && !dirs_to_scan.contains(&path.to_path_buf()) { - dirs_to_scan.push(path.to_path_buf()); - } + && path.exists() + && !dirs_to_scan.contains(&path.to_path_buf()) + { + dirs_to_scan.push(path.to_path_buf()); + } } } } @@ -412,10 +414,7 @@ pub fn syncback_loop_with_stats( if !is_valid_path(&ignore_patterns, project_path, file) { continue; } - log::trace!( - "Adding alternate file to orphan check: {}", - file.display() - ); + log::trace!("Adding alternate file to orphan check: {}", file.display()); paths.insert(file.clone()); } @@ -687,10 +686,22 @@ pub fn syncback_loop_with_stats( } else { format!("{}/{}", instance_path, name) }; - collect_all_path_refs_and_mappings(child, base_path, &child_inst_path, protected, mappings); + collect_all_path_refs_and_mappings( + child, + base_path, + &child_inst_path, + protected, + mappings, + ); } } - collect_all_path_refs_and_mappings(&project.tree, project_path, "", &mut protected_paths, &mut path_to_instance_prefix); + collect_all_path_refs_and_mappings( + &project.tree, + project_path, + "", + &mut protected_paths, + &mut path_to_instance_prefix, + ); log::trace!("Protected $path references: {:?}", protected_paths); log::trace!("Path to instance mappings: {:?}", path_to_instance_prefix); @@ -757,7 +768,8 @@ pub fn syncback_loop_with_stats( if !pattern_str.contains('*') && !pattern_str.contains('?') { if pattern_str.starts_with(&inst_path_str) && pattern_str.len() > inst_path_str.len() - && pattern_str.as_bytes().get(inst_path_str.len()) == Some(&b'/') + && pattern_str.as_bytes().get(inst_path_str.len()) + == Some(&b'/') { log::trace!( "Skipping {} (ancestor of literal ignoreTrees path, inst_path: {})", @@ -773,11 +785,15 @@ pub fn syncback_loop_with_stats( // that are inside this directory. let dir_contains_match = existing_paths.iter().any(|child_path| { // Only check children of this directory - if !child_path.starts_with(&old_path_norm) || child_path == &old_path_norm { + if !child_path.starts_with(&old_path_norm) + || child_path == &old_path_norm + { return false; } // Convert child path to instance path and check glob match - if let Some(child_inst_path) = fs_path_to_instance_path(child_path) { + if let Some(child_inst_path) = + fs_path_to_instance_path(child_path) + { if glob.is_match(&child_inst_path) { log::trace!( "Directory {} contains ignored file {} (inst: {})",