diff --git a/src/json.rs b/src/json.rs index bf079d82..2d9e4744 100644 --- a/src/json.rs +++ b/src/json.rs @@ -166,7 +166,6 @@ pub fn to_vec_pretty_sorted(value: &T) -> anyhow::Result> serde_json::to_vec_pretty(&sorted_value).context("Failed to serialize to JSON") } - #[cfg(test)] mod tests { use super::*; diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs index 1fa99b63..9ca115b2 100644 --- a/src/snapshot_middleware/meta_file.rs +++ b/src/snapshot_middleware/meta_file.rs @@ -57,10 +57,7 @@ impl AdjacentMetadata { // when encodeWindowsInvalidChars is enabled. // Strip known script type suffixes (.server, .client, .plugin) to get // the base name for the meta file. - let file_stem = path - .file_stem() - .and_then(|s| s.to_str()) - .unwrap_or(""); + let file_stem = path.file_stem().and_then(|s| s.to_str()).unwrap_or(""); let base_name = file_stem .strip_suffix(".server") .or_else(|| file_stem.strip_suffix(".client")) diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs index 2e92411b..77647472 100644 --- a/src/snapshot_middleware/rbxm.rs +++ b/src/snapshot_middleware/rbxm.rs @@ -58,11 +58,7 @@ pub fn syncback_rbxm<'sync>( serialized } else { // Clone the subtree, filtering out ignored instances - let filtered_tree = clone_tree_filtered( - snapshot.new_tree(), - inst.referent(), - &tree_globs, - ); + let filtered_tree = clone_tree_filtered(snapshot.new_tree(), inst.referent(), &tree_globs); let mut serialized = Vec::new(); rbx_binary::to_writer(&mut serialized, &filtered_tree, &[filtered_tree.root_ref()]) .context("failed to serialize filtered rbxm")?; @@ -99,7 +95,9 @@ fn add_children_filtered( builder: &mut InstanceBuilder, ignore_globs: &[Glob], ) { - let parent = source.get_by_ref(parent_ref).expect("parent ref should exist"); + let parent = source + .get_by_ref(parent_ref) + .expect("parent ref should exist"); for &child_ref in parent.children() { let child_path = inst_path(source, child_ref); @@ -112,7 +110,9 @@ fn add_children_filtered( continue; } - let child = source.get_by_ref(child_ref).expect("child ref should exist"); + let child = source + .get_by_ref(child_ref) + .expect("child ref should exist"); let mut child_builder = InstanceBuilder::new(child.class) .with_name(child.name.clone()) diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs index ebef1483..eb8a313a 100644 --- a/src/snapshot_middleware/rbxmx.rs +++ b/src/snapshot_middleware/rbxmx.rs @@ -69,11 +69,7 @@ pub fn syncback_rbxmx<'sync>( serialized } else { // Clone the subtree, filtering out ignored instances - let filtered_tree = clone_tree_filtered( - snapshot.new_tree(), - inst.referent(), - &tree_globs, - ); + let filtered_tree = clone_tree_filtered(snapshot.new_tree(), inst.referent(), &tree_globs); let mut serialized = Vec::new(); rbx_xml::to_writer( &mut serialized, diff --git a/src/syncback/file_names.rs b/src/syncback/file_names.rs index 09646d7e..ce06209e 100644 --- a/src/syncback/file_names.rs +++ b/src/syncback/file_names.rs @@ -48,7 +48,10 @@ pub fn name_for_inst<'old>( encoded } else { validate_file_name(&new_inst.name).with_context(|| { - format!("name '{}' is not legal to write to the file system", new_inst.name) + format!( + "name '{}' is not legal to write to the file system", + new_inst.name + ) })?; new_inst.name.clone() }; @@ -65,7 +68,10 @@ pub fn name_for_inst<'old>( encoded } else { validate_file_name(&new_inst.name).with_context(|| { - format!("name '{}' is not legal to write to the file system", new_inst.name) + format!( + "name '{}' is not legal to write to the file system", + new_inst.name + ) })?; new_inst.name.clone() }; diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs index 597459e3..18fb9a7f 100644 --- a/src/syncback/mod.rs +++ b/src/syncback/mod.rs @@ -369,8 +369,8 @@ pub fn get_best_middleware(snapshot: &SyncbackSnapshot) -> Middleware { middleware = Middleware::JsonModel; } else { middleware = match inst.class.as_str() { - "Folder" | "Configuration" | "Tool" - | "ScreenGui" | "SurfaceGui" | "BillboardGui" | "AdGui" => Middleware::Dir, + "Folder" | "Configuration" | "Tool" | "ScreenGui" | "SurfaceGui" | "BillboardGui" + | "AdGui" => Middleware::Dir, "StringValue" => Middleware::Text, "Script" => Middleware::ServerScript, "LocalScript" => Middleware::ClientScript, @@ -478,8 +478,9 @@ impl SyncbackRules { let mut globs = Vec::with_capacity(self.ignore_trees.len()); for pattern in &self.ignore_trees { - let glob = Glob::new(pattern) - .with_context(|| format!("the pattern '{pattern}' is not a valid ignoreTrees glob"))?; + let glob = Glob::new(pattern).with_context(|| { + format!("the pattern '{pattern}' is not a valid ignoreTrees glob") + })?; globs.push(glob); } diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs index b314db05..b7a0660b 100644 --- a/src/syncback/snapshot.rs +++ b/src/syncback/snapshot.rs @@ -249,7 +249,9 @@ impl<'sync> SyncbackSnapshot<'sync> { // Try glob matching first, fall back to prefix matching for backwards compatibility if let Ok(glob) = Glob::new(pattern) { if glob.is_match(&path) { - log::debug!("Ignoring {path} because it matches ignoreTrees glob: {pattern}"); + log::debug!( + "Ignoring {path} because it matches ignoreTrees glob: {pattern}" + ); return true; } } else if path.starts_with(pattern.as_str()) { diff --git a/src/web/api.rs b/src/web/api.rs index d20e78d6..2e32135d 100644 --- a/src/web/api.rs +++ b/src/web/api.rs @@ -1,7 +1,13 @@ //! Defines Rojo's HTTP API, all under /api. These endpoints generally return //! JSON. -use std::{collections::{HashMap, HashSet}, fs, path::PathBuf, str::FromStr, sync::Arc}; +use std::{ + collections::{HashMap, HashSet}, + fs, + path::PathBuf, + str::FromStr, + sync::Arc, +}; use futures::{sink::SinkExt, stream::StreamExt}; use hyper::{body, Body, Method, Request, Response, StatusCode};