From 146e3b77bd640722788c1e16025fcc0b414907bb Mon Sep 17 00:00:00 2001
From: simonsan <14062932+simonsan@users.noreply.github.com>
Date: Tue, 5 Mar 2024 23:10:22 +0100
Subject: [PATCH] test: fix lints (#864)

Signed-off-by: simonsan <14062932+simonsan@users.noreply.github.com>
---
 cli/tests/generate_app.rs |  8 ++++----
 core/tests/component.rs   | 37 ++++++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/cli/tests/generate_app.rs b/cli/tests/generate_app.rs
index c4ce8a49..f9c50bbd 100644
--- a/cli/tests/generate_app.rs
+++ b/cli/tests/generate_app.rs
@@ -41,7 +41,7 @@ fn test_generated_app() {
     for test_command in TEST_COMMANDS {
         let mut runner = RUNNER.clone();
         runner
-            .args(test_command.split(" "))
+            .args(test_command.split(' '))
             .status()
             .expect_success();
     }
@@ -55,7 +55,7 @@ fn generate_app(path: &Path) {
 
     // Run `abscissa new` to generate the app
     CmdRunner::default()
-        .args(&[
+        .args([
             "new",
             &path.display().to_string(),
             "--force",
@@ -74,7 +74,7 @@ fn generate_app(path: &Path) {
         let test_file = entry.unwrap().path();
         fs::copy(
             &test_file,
-            app_test_dir.join(&test_file.file_name().unwrap()),
+            app_test_dir.join(test_file.file_name().unwrap()),
         )
         .unwrap();
     }
@@ -88,7 +88,7 @@ fn generate_subcommand(path: &Path) {
     let name = "foo-bar-baz";
 
     CmdRunner::default()
-        .args(&[
+        .args([
             "gen",
             "cmd",
             "--manifest-path",
diff --git a/core/tests/component.rs b/core/tests/component.rs
index 79ddcccf..0faca481 100644
--- a/core/tests/component.rs
+++ b/core/tests/component.rs
@@ -64,8 +64,8 @@ fn init_components() -> Vec<Box<dyn Component<ExampleApp>>> {
     foobar.set_state("original foobar state");
 
     let component1 = Box::new(foobar);
-    let component2 = Box::new(BazComponent::default());
-    let component3 = Box::new(QuuxComponent::default());
+    let component2 = Box::<BazComponent>::default();
+    let component3 = Box::<QuuxComponent>::default();
 
     let components: Vec<Box<dyn Component<ExampleApp>>> = vec![component1, component2, component3];
 
@@ -87,20 +87,20 @@ fn component_registration() {
     assert_eq!(registry.len(), 3);
 
     // Fetch components and make sure they got registered correctly
-    let foobar = registry.get_by_id(FOOBAR_COMPONENT_ID).unwrap();
-    assert_eq!(foobar.id(), FOOBAR_COMPONENT_ID);
+    let foobar_comp = registry.get_by_id(FOOBAR_COMPONENT_ID).unwrap();
+    assert_eq!(foobar_comp.id(), FOOBAR_COMPONENT_ID);
 
-    let baz = registry.get_by_id(BAZ_COMPONENT_ID).unwrap();
-    assert_eq!(baz.id(), BAZ_COMPONENT_ID);
+    let baz_comp = registry.get_by_id(BAZ_COMPONENT_ID).unwrap();
+    assert_eq!(baz_comp.id(), BAZ_COMPONENT_ID);
 
-    let quux = registry.get_by_id(QUUX_COMPONENT_ID).unwrap();
-    assert_eq!(quux.id(), QUUX_COMPONENT_ID);
+    let quux_comp = registry.get_by_id(QUUX_COMPONENT_ID).unwrap();
+    assert_eq!(quux_comp.id(), QUUX_COMPONENT_ID);
 }
 
 #[test]
 fn duplicate_component_registration() {
-    let foobar1 = Box::new(FoobarComponent::default());
-    let foobar2 = Box::new(FoobarComponent::default());
+    let foobar1 = Box::<FoobarComponent>::default();
+    let foobar2 = Box::<FoobarComponent>::default();
     let components: Vec<Box<dyn Component<ExampleApp>>> = vec![foobar1, foobar2];
 
     let mut registry = component::Registry::default();
@@ -117,7 +117,7 @@ fn duplicate_component_registration() {
 #[test]
 fn get_downcast_ref() {
     let mut registry = component::Registry::default();
-    let component = Box::new(FoobarComponent::default()) as Box<dyn Component<ExampleApp>>;
+    let component = Box::<FoobarComponent>::default() as Box<dyn Component<ExampleApp>>;
     registry.register(vec![component]).unwrap();
 
     {
@@ -126,8 +126,8 @@ fn get_downcast_ref() {
     }
 
     {
-        let foo = registry.get_downcast_ref::<FoobarComponent>().unwrap();
-        assert_eq!(foo.state.as_ref().unwrap(), "mutated!");
+        let foo_comp = registry.get_downcast_ref::<FoobarComponent>().unwrap();
+        assert_eq!(foo_comp.state.as_ref().unwrap(), "mutated!");
     }
 }
 
@@ -142,9 +142,12 @@ fn dependency_injection() {
     registry.register(components).unwrap();
     registry.after_config(&ExampleConfig::default()).unwrap();
 
-    let foobar = registry.get_downcast_ref::<FoobarComponent>().unwrap();
-    assert_eq!(foobar.state.as_ref().unwrap(), "hijacked!");
+    let foobar_comp = registry.get_downcast_ref::<FoobarComponent>().unwrap();
+    assert_eq!(foobar_comp.state.as_ref().unwrap(), "hijacked!");
 
-    let quux = registry.get_downcast_ref::<QuuxComponent>().unwrap();
-    assert_eq!(quux.foobar_state.as_ref().unwrap(), "original foobar state");
+    let quux_comp = registry.get_downcast_ref::<QuuxComponent>().unwrap();
+    assert_eq!(
+        quux_comp.foobar_state.as_ref().unwrap(),
+        "original foobar state"
+    );
 }