From 75e33cf0c53ad4ed507af9ff3241022216f5e78f Mon Sep 17 00:00:00 2001 From: Jack T Date: Sun, 12 Jan 2025 00:54:34 -0800 Subject: [PATCH] Fix clippy lint warnings --- crates/rojo-insta-ext/src/redaction_map.rs | 8 +--- src/lua_ast.rs | 1 + src/multimap.rs | 4 +- src/project.rs | 4 +- src/snapshot/patch_compute.rs | 4 +- src/snapshot/tests/apply.rs | 8 ++-- src/snapshot/tests/compute.rs | 10 ++--- src/snapshot/tree.rs | 4 +- src/snapshot_middleware/csv.rs | 8 ++-- src/snapshot_middleware/dir.rs | 18 ++++---- src/snapshot_middleware/json.rs | 4 +- src/snapshot_middleware/lua.rs | 52 +++++++++++----------- src/snapshot_middleware/rbxm.rs | 4 +- src/snapshot_middleware/rbxmx.rs | 4 +- src/snapshot_middleware/toml.rs | 4 +- src/snapshot_middleware/txt.rs | 4 +- src/web/interface.rs | 2 +- tests/rojo_test/serve_util.rs | 2 +- 18 files changed, 69 insertions(+), 76 deletions(-) diff --git a/crates/rojo-insta-ext/src/redaction_map.rs b/crates/rojo-insta-ext/src/redaction_map.rs index 225747048..fab06bf97 100644 --- a/crates/rojo-insta-ext/src/redaction_map.rs +++ b/crates/rojo-insta-ext/src/redaction_map.rs @@ -5,19 +5,13 @@ use serde::Serialize; /// Enables redacting any value that serializes as a string. /// /// Used for transforming Rojo instance IDs into something deterministic. +#[derive(Default)] pub struct RedactionMap { ids: HashMap, last_id: usize, } impl RedactionMap { - pub fn new() -> Self { - Self { - ids: HashMap::new(), - last_id: 0, - } - } - pub fn get_redacted_value(&self, id: impl ToString) -> Option { let id = id.to_string(); diff --git a/src/lua_ast.rs b/src/lua_ast.rs index a61e41c95..6734e8c66 100644 --- a/src/lua_ast.rs +++ b/src/lua_ast.rs @@ -22,6 +22,7 @@ trait FmtLua { } } +#[allow(dead_code)] struct DisplayLua(T); impl fmt::Display for DisplayLua diff --git a/src/multimap.rs b/src/multimap.rs index 9c399c24d..fae6cff59 100644 --- a/src/multimap.rs +++ b/src/multimap.rs @@ -19,10 +19,10 @@ impl MultiMap { } } - pub fn get(&self, k: &Q) -> &[V] + pub fn get(&self, k: &Q) -> &[V] where K: Borrow, - Q: Hash + Eq, + Q: Hash + Eq + ?Sized, { self.inner.get(k).map(Vec::as_slice).unwrap_or(&[]) } diff --git a/src/project.rs b/src/project.rs index a83088c04..2b76d66f4 100644 --- a/src/project.rs +++ b/src/project.rs @@ -230,7 +230,7 @@ impl Project { io::ErrorKind::NotFound => Error::NoProjectFound { path: project_path.to_path_buf(), }, - _ => return e.into(), + _ => e.into(), })?; Ok(Some(Self::load_from_slice(&contents, project_path, None)?)) @@ -250,7 +250,7 @@ impl Project { io::ErrorKind::NotFound => Error::NoProjectFound { path: project_path.to_path_buf(), }, - _ => return e.into(), + _ => e.into(), })?; Ok(Self::load_from_slice( diff --git a/src/snapshot/patch_compute.rs b/src/snapshot/patch_compute.rs index cb3141768..ec93d8b34 100644 --- a/src/snapshot/patch_compute.rs +++ b/src/snapshot/patch_compute.rs @@ -313,7 +313,7 @@ mod test { // addition of a prop named Self, which is a self-referential Ref. let snapshot_id = Ref::new(); let snapshot = InstanceSnapshot { - snapshot_id: snapshot_id, + snapshot_id, properties: [("Self".to_owned(), Variant::Ref(snapshot_id))].into(), metadata: Default::default(), @@ -351,7 +351,7 @@ mod test { // This patch describes the existing instance with a new child added. let snapshot_id = Ref::new(); let snapshot = InstanceSnapshot { - snapshot_id: snapshot_id, + snapshot_id, children: vec![InstanceSnapshot { properties: [("Self".to_owned(), Variant::Ref(snapshot_id))].into(), diff --git a/src/snapshot/tests/apply.rs b/src/snapshot/tests/apply.rs index 27b16904c..3e335b6bf 100644 --- a/src/snapshot/tests/apply.rs +++ b/src/snapshot/tests/apply.rs @@ -9,7 +9,7 @@ use crate::{ #[test] fn set_name_and_class_name() { - let mut redactions = RedactionMap::new(); + let mut redactions = RedactionMap::default(); let mut tree = empty_tree(); intern_tree(&tree, &mut redactions); @@ -36,7 +36,7 @@ fn set_name_and_class_name() { #[test] fn add_property() { - let mut redactions = RedactionMap::new(); + let mut redactions = RedactionMap::default(); let mut tree = empty_tree(); intern_tree(&tree, &mut redactions); @@ -63,7 +63,7 @@ fn add_property() { #[test] fn remove_property() { - let mut redactions = RedactionMap::new(); + let mut redactions = RedactionMap::default(); let mut tree = empty_tree(); intern_tree(&tree, &mut redactions); @@ -85,7 +85,7 @@ fn remove_property() { id: tree.get_root_id(), changed_name: None, changed_class_name: None, - changed_properties: [("Foo".to_owned(), None).into()].into(), + changed_properties: [("Foo".to_owned(), None)].into(), changed_metadata: None, }], ..Default::default() diff --git a/src/snapshot/tests/compute.rs b/src/snapshot/tests/compute.rs index ae1e2b4cc..63c3ba66e 100644 --- a/src/snapshot/tests/compute.rs +++ b/src/snapshot/tests/compute.rs @@ -9,7 +9,7 @@ use crate::snapshot::{compute_patch_set, InstanceSnapshot, RojoTree}; #[test] fn set_name_and_class_name() { - let mut redactions = RedactionMap::new(); + let mut redactions = RedactionMap::default(); let tree = empty_tree(); redactions.intern(tree.get_root_id()); @@ -31,7 +31,7 @@ fn set_name_and_class_name() { #[test] fn set_property() { - let mut redactions = RedactionMap::new(); + let mut redactions = RedactionMap::default(); let tree = empty_tree(); redactions.intern(tree.get_root_id()); @@ -53,7 +53,7 @@ fn set_property() { #[test] fn remove_property() { - let mut redactions = RedactionMap::new(); + let mut redactions = RedactionMap::default(); let mut tree = empty_tree(); redactions.intern(tree.get_root_id()); @@ -84,7 +84,7 @@ fn remove_property() { #[test] fn add_child() { - let mut redactions = RedactionMap::new(); + let mut redactions = RedactionMap::default(); let tree = empty_tree(); redactions.intern(tree.get_root_id()); @@ -113,7 +113,7 @@ fn add_child() { #[test] fn remove_child() { - let mut redactions = RedactionMap::new(); + let mut redactions = RedactionMap::default(); let mut tree = empty_tree(); redactions.intern(tree.get_root_id()); diff --git a/src/snapshot/tree.rs b/src/snapshot/tree.rs index 8c30d5ef7..3d4c6fb2e 100644 --- a/src/snapshot/tree.rs +++ b/src/snapshot/tree.rs @@ -148,7 +148,7 @@ impl RojoTree { // We need to uphold the invariant that each ID can only map // to one referent. if let Some(new) = &metadata.specified_id { - if self.specified_id_to_refs.get(new).len() > 0 { + if !self.specified_id_to_refs.get(new).is_empty() { log::error!("Duplicate user-specified referent '{new}'"); } @@ -206,7 +206,7 @@ impl RojoTree { } if let Some(specified_id) = &metadata.specified_id { - if self.specified_id_to_refs.get(specified_id).len() > 0 { + if !self.specified_id_to_refs.get(specified_id).is_empty() { log::error!("Duplicate user-specified referent '{specified_id}'"); } diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs index 6fefa5f23..7e4aa437b 100644 --- a/src/snapshot_middleware/csv.rs +++ b/src/snapshot_middleware/csv.rs @@ -177,11 +177,11 @@ Ack,Ack!,,An exclamation of despair,¡Ay!"#, ) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); let instance_snapshot = snapshot_csv( &InstanceContext::default(), - &mut vfs, + &vfs, Path::new("/foo.csv"), "foo", ) @@ -209,11 +209,11 @@ Ack,Ack!,,An exclamation of despair,¡Ay!"#, ) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); let instance_snapshot = snapshot_csv( &InstanceContext::default(), - &mut vfs, + &vfs, Path::new("/foo.csv"), "foo", ) diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs index a68674ebb..5cfab8d54 100644 --- a/src/snapshot_middleware/dir.rs +++ b/src/snapshot_middleware/dir.rs @@ -116,12 +116,11 @@ mod test { imfs.load_snapshot("/foo", VfsSnapshot::empty_dir()) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); - let instance_snapshot = - snapshot_dir(&InstanceContext::default(), &mut vfs, Path::new("/foo")) - .unwrap() - .unwrap(); + let instance_snapshot = snapshot_dir(&InstanceContext::default(), &vfs, Path::new("/foo")) + .unwrap() + .unwrap(); insta::assert_yaml_snapshot!(instance_snapshot); } @@ -135,12 +134,11 @@ mod test { ) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); - let instance_snapshot = - snapshot_dir(&InstanceContext::default(), &mut vfs, Path::new("/foo")) - .unwrap() - .unwrap(); + let instance_snapshot = snapshot_dir(&InstanceContext::default(), &vfs, Path::new("/foo")) + .unwrap() + .unwrap(); insta::assert_yaml_snapshot!(instance_snapshot); } diff --git a/src/snapshot_middleware/json.rs b/src/snapshot_middleware/json.rs index 3ec651111..bb681779e 100644 --- a/src/snapshot_middleware/json.rs +++ b/src/snapshot_middleware/json.rs @@ -98,11 +98,11 @@ mod test { ) .unwrap(); - let mut vfs = Vfs::new(imfs.clone()); + let vfs = Vfs::new(imfs.clone()); let instance_snapshot = snapshot_json( &InstanceContext::default(), - &mut vfs, + &vfs, Path::new("/foo.json"), "foo", ) diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs index c20cac867..d17c90cb1 100644 --- a/src/snapshot_middleware/lua.rs +++ b/src/snapshot_middleware/lua.rs @@ -124,11 +124,11 @@ mod test { imfs.load_snapshot("/foo.lua", VfsSnapshot::file("Hello there!")) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); let instance_snapshot = snapshot_lua( &InstanceContext::with_emit_legacy_scripts(Some(true)), - &mut vfs, + &vfs, Path::new("/foo.lua"), "foo", ScriptType::Module, @@ -147,11 +147,11 @@ mod test { imfs.load_snapshot("/foo.lua", VfsSnapshot::file("Hello there!")) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); let instance_snapshot = snapshot_lua( &InstanceContext::with_emit_legacy_scripts(Some(false)), - &mut vfs, + &vfs, Path::new("/foo.lua"), "foo", ScriptType::Module, @@ -170,11 +170,11 @@ mod test { imfs.load_snapshot("/foo.server.lua", VfsSnapshot::file("Hello there!")) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); let instance_snapshot = snapshot_lua( &InstanceContext::with_emit_legacy_scripts(Some(true)), - &mut vfs, + &vfs, Path::new("/foo.server.lua"), "foo", ScriptType::Server, @@ -193,11 +193,11 @@ mod test { imfs.load_snapshot("/foo.server.lua", VfsSnapshot::file("Hello there!")) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); let instance_snapshot = snapshot_lua( &InstanceContext::with_emit_legacy_scripts(Some(false)), - &mut vfs, + &vfs, Path::new("/foo.server.lua"), "foo", ScriptType::Server, @@ -216,11 +216,11 @@ mod test { imfs.load_snapshot("/foo.client.lua", VfsSnapshot::file("Hello there!")) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); let instance_snapshot = snapshot_lua( &InstanceContext::with_emit_legacy_scripts(Some(true)), - &mut vfs, + &vfs, Path::new("/foo.client.lua"), "foo", ScriptType::Client, @@ -239,11 +239,11 @@ mod test { imfs.load_snapshot("/foo.client.lua", VfsSnapshot::file("Hello there!")) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); let instance_snapshot = snapshot_lua( &InstanceContext::with_emit_legacy_scripts(Some(false)), - &mut vfs, + &vfs, Path::new("/foo.client.lua"), "foo", ScriptType::Client, @@ -266,11 +266,11 @@ mod test { ) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); let instance_snapshot = snapshot_lua( &InstanceContext::with_emit_legacy_scripts(Some(true)), - &mut vfs, + &vfs, Path::new("/root"), "root", ScriptType::Module, @@ -300,11 +300,11 @@ mod test { ) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); let instance_snapshot = snapshot_lua( &InstanceContext::with_emit_legacy_scripts(Some(true)), - &mut vfs, + &vfs, Path::new("/foo.lua"), "foo", ScriptType::Module, @@ -334,11 +334,11 @@ mod test { ) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); let instance_snapshot = snapshot_lua( &InstanceContext::with_emit_legacy_scripts(Some(false)), - &mut vfs, + &vfs, Path::new("/foo.lua"), "foo", ScriptType::Module, @@ -368,11 +368,11 @@ mod test { ) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); let instance_snapshot = snapshot_lua( &InstanceContext::with_emit_legacy_scripts(Some(true)), - &mut vfs, + &vfs, Path::new("/foo.server.lua"), "foo", ScriptType::Server, @@ -402,11 +402,11 @@ mod test { ) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); let instance_snapshot = snapshot_lua( &InstanceContext::with_emit_legacy_scripts(Some(false)), - &mut vfs, + &vfs, Path::new("/foo.server.lua"), "foo", ScriptType::Server, @@ -438,11 +438,11 @@ mod test { ) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); let instance_snapshot = snapshot_lua( &InstanceContext::with_emit_legacy_scripts(Some(true)), - &mut vfs, + &vfs, Path::new("/bar.server.lua"), "bar", ScriptType::Server, @@ -474,11 +474,11 @@ mod test { ) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); let instance_snapshot = snapshot_lua( &InstanceContext::with_emit_legacy_scripts(Some(false)), - &mut vfs, + &vfs, Path::new("/bar.server.lua"), "bar", ScriptType::Server, diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs index 7983d0e71..f2c08dd0e 100644 --- a/src/snapshot_middleware/rbxm.rs +++ b/src/snapshot_middleware/rbxm.rs @@ -54,11 +54,11 @@ mod test { ) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); let instance_snapshot = snapshot_rbxm( &InstanceContext::default(), - &mut vfs, + &vfs, Path::new("/foo.rbxm"), "foo", ) diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs index 4266dc0d7..d71e28b75 100644 --- a/src/snapshot_middleware/rbxmx.rs +++ b/src/snapshot_middleware/rbxmx.rs @@ -66,11 +66,11 @@ mod test { ) .unwrap(); - let mut vfs = Vfs::new(imfs); + let vfs = Vfs::new(imfs); let instance_snapshot = snapshot_rbxmx( &InstanceContext::default(), - &mut vfs, + &vfs, Path::new("/foo.rbxmx"), "foo", ) diff --git a/src/snapshot_middleware/toml.rs b/src/snapshot_middleware/toml.rs index a219d7e75..11212e186 100644 --- a/src/snapshot_middleware/toml.rs +++ b/src/snapshot_middleware/toml.rs @@ -105,11 +105,11 @@ mod test { ) .unwrap(); - let mut vfs = Vfs::new(imfs.clone()); + let vfs = Vfs::new(imfs.clone()); let instance_snapshot = snapshot_toml( &InstanceContext::default(), - &mut vfs, + &vfs, Path::new("/foo.toml"), "foo", ) diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs index 9076f160e..b748667ee 100644 --- a/src/snapshot_middleware/txt.rs +++ b/src/snapshot_middleware/txt.rs @@ -50,11 +50,11 @@ mod test { imfs.load_snapshot("/foo.txt", VfsSnapshot::file("Hello there!")) .unwrap(); - let mut vfs = Vfs::new(imfs.clone()); + let vfs = Vfs::new(imfs.clone()); let instance_snapshot = snapshot_txt( &InstanceContext::default(), - &mut vfs, + &vfs, Path::new("/foo.txt"), "foo", ) diff --git a/src/web/interface.rs b/src/web/interface.rs index c10e14bc9..365ef0316 100644 --- a/src/web/interface.rs +++ b/src/web/interface.rs @@ -119,7 +119,7 @@ pub struct Instance<'a> { pub metadata: Option, } -impl<'a> Instance<'a> { +impl Instance<'_> { pub(crate) fn from_rojo_instance(source: InstanceWithMeta<'_>) -> Instance<'_> { let properties = source .properties() diff --git a/tests/rojo_test/serve_util.rs b/tests/rojo_test/serve_util.rs index 2c33e952c..56061935b 100644 --- a/tests/rojo_test/serve_util.rs +++ b/tests/rojo_test/serve_util.rs @@ -28,7 +28,7 @@ use crate::rojo_test::io_util::{ pub fn run_serve_test(test_name: &str, callback: impl FnOnce(TestServeSession, RedactionMap)) { let _ = env_logger::try_init(); - let mut redactions = RedactionMap::new(); + let mut redactions = RedactionMap::default(); let mut session = TestServeSession::new(test_name); let info = session.wait_to_come_online();