From 85787f3452fefba565590851f52b335dfafcaee8 Mon Sep 17 00:00:00 2001
From: Joe <joe.melsha@live.com>
Date: Tue, 17 Feb 2026 06:34:44 -0600
Subject: [PATCH] Refactor code for improved readability and consistency

- Simplified the formatting of path handling in `change_processor.rs` and `fs_snapshot.rs` by consolidating multiple lines into single lines for better clarity.
- Updated test assertions in `two_way_sync.rs` to streamline the code and enhance maintainability.

These changes enhance the overall readability of the codebase, making it easier to manage and understand.
---
 src/change_processor.rs     | 10 +++-------
 src/syncback/fs_snapshot.rs | 14 ++++++++++++--
 src/web/api.rs              |  8 +-------
 tests/tests/two_way_sync.rs |  6 +-----
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/change_processor.rs b/src/change_processor.rs
index b31b408d..b3c201e4 100644
--- a/src/change_processor.rs
+++ b/src/change_processor.rs
@@ -1236,19 +1236,15 @@ impl JobThreadContext {
                                                 // is dir/init.luau; the dir was
                                                 // renamed so update the dir
                                                 // portion.
-                                                let init_name = old_path
-                                                    .file_name()
-                                                    .unwrap()
-                                                    .to_str()
-                                                    .unwrap();
+                                                let init_name =
+                                                    old_path.file_name().unwrap().to_str().unwrap();
                                                 to.join(init_name)
                                             } else {
                                                 // Standalone file: new source
                                                 // IS the `to` path.
                                                 to.clone()
                                             };
-                                            dedup_metadata_updates
-                                                .push((sibling_ref, new_source));
+                                            dedup_metadata_updates.push((sibling_ref, new_source));
                                         }
                                     }
                                     break;
diff --git a/src/syncback/fs_snapshot.rs b/src/syncback/fs_snapshot.rs
index 1f5d5db4..bf97290a 100644
--- a/src/syncback/fs_snapshot.rs
+++ b/src/syncback/fs_snapshot.rs
@@ -538,7 +538,12 @@ mod tests {
         let substitutions = vec![("Workspace/Foo".to_string(), "Workspace/Foo~1".to_string())];
         snap.fix_ref_paths(&substitutions);
 
-        let result = std::str::from_utf8(snap.added_files.get(Path::new("/test/init.meta.json5")).unwrap()).unwrap();
+        let result = std::str::from_utf8(
+            snap.added_files
+                .get(Path::new("/test/init.meta.json5"))
+                .unwrap(),
+        )
+        .unwrap();
 
         assert!(
             result.contains(r#""Rojo_Ref_PrimaryPart": "Workspace/Foo~1""#),
@@ -564,7 +569,12 @@ mod tests {
         let substitutions = vec![("Workspace/Foo".to_string(), "Workspace/Foo~1".to_string())];
         snap.fix_ref_paths(&substitutions);
 
-        let result = std::str::from_utf8(snap.added_files.get(Path::new("/test/script.luau")).unwrap()).unwrap();
+        let result = std::str::from_utf8(
+            snap.added_files
+                .get(Path::new("/test/script.luau"))
+                .unwrap(),
+        )
+        .unwrap();
         assert!(
             result.contains("Workspace/Foo"),
             "Non-meta file should not be touched. Got: {}",
diff --git a/src/web/api.rs b/src/web/api.rs
index 0baa3555..cd15b96d 100644
--- a/src/web/api.rs
+++ b/src/web/api.rs
@@ -3574,13 +3574,7 @@ fn added_instance_fs_segment(added: &crate::web::interface::AddedInstance) -> St
 
     let is_container = matches!(
         added.class_name.as_str(),
-        "Folder"
-            | "Configuration"
-            | "Tool"
-            | "ScreenGui"
-            | "SurfaceGui"
-            | "BillboardGui"
-            | "AdGui"
+        "Folder" | "Configuration" | "Tool" | "ScreenGui" | "SurfaceGui" | "BillboardGui" | "AdGui"
     );
 
     let is_script = matches!(
diff --git a/tests/tests/two_way_sync.rs b/tests/tests/two_way_sync.rs
index 35f4bbe4..e2a46c25 100644
--- a/tests/tests/two_way_sync.rs
+++ b/tests/tests/two_way_sync.rs
@@ -7374,10 +7374,6 @@ fn ref_same_batch_add_folder_target_no_extension() {
         let meta_path = session
             .path()
             .join("src/Workspace/TestModel/init.meta.json5");
-        poll_meta_has_ref_attr(
-            &meta_path,
-            "Rojo_Ref_PrimaryPart",
-            "Workspace/FolderTarget",
-        );
+        poll_meta_has_ref_attr(&meta_path, "Rojo_Ref_PrimaryPart", "Workspace/FolderTarget");
     });
 }