solve clippy issues

vectordotdev · Mar 6, 2025 · 214cce4 · 214cce4
1 parent d67394c
commit 214cce4
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 38 deletions.
diff --git a/lib/vector-common/src/config.rs b/lib/vector-common/src/config.rs
@@ -41,7 +41,7 @@ impl ComponentKey {
 
 impl AsRef<ComponentKey> for ComponentKey {
     fn as_ref(&self) -> &ComponentKey {
-        &self
+        self
     }
 }
 

diff --git a/src/config/mod.rs b/src/config/mod.rs
@@ -83,7 +83,7 @@ pub struct ComponentConfig {
 }
 
 impl ComponentConfig {
-    pub fn new(config_paths: Vec<PathBuf>, component_key: ComponentKey) -> Self {
+    pub const fn new(config_paths: Vec<PathBuf>, component_key: ComponentKey) -> Self {
         Self {
             config_paths,
             component_key,

diff --git a/src/config/watcher.rs b/src/config/watcher.rs
@@ -76,8 +76,7 @@ pub fn spawn_thread<'a>(
     let mut component_config_paths: Vec<_> = component_configs
         .clone()
         .into_iter()
-        .map(|p| p.config_paths.clone())
-        .flatten()
+        .flat_map(|p| p.config_paths.clone())
         .collect();
 
     config_paths.append(&mut component_config_paths);
@@ -107,8 +106,7 @@ pub fn spawn_thread<'a>(
                     let component_keys: Vec<_> = component_configs
                         .clone()
                         .into_iter()
-                        .map(|p| p.contains(&event.paths))
-                        .flatten()
+                        .flat_map(|p| p.contains(&event.paths))
                         .collect();
 
                     // We need to read paths to resolve any inode changes that may have happened.
@@ -121,7 +119,7 @@ pub fn spawn_thread<'a>(
                     debug!(message = "Reloaded paths.");
 
                     info!("Configuration file changed.");
-                    if component_keys.len() > 0 {
+                    if !component_keys.is_empty() {
                         info!("Component {:?} configuration changed.", component_keys);
                         _ = signal_tx.send(crate::signal::SignalTo::ReloadComponents(component_keys)).map_err(|error| {
                             error!(message = "Unable to reload component configuration. Restart Vector to reload it.", cause = %error)
@@ -187,6 +185,7 @@ mod tests {
     use crate::{
         signal::SignalRx,
         test_util::{temp_dir, temp_file, trace_init},
+        config::ComponentKey,
     };
     use std::{fs::File, io::Write, time::Duration};
     use tokio::sync::broadcast;
@@ -209,14 +208,14 @@ mod tests {
         let dir = temp_dir().to_path_buf();
         let file_path = dir.join("vector.toml");
         let watcher_conf = WatcherConfig::RecommendedWatcher;
-        let component_file_path = Vec::new(dir.join("tls.cert"), dir.join("tls.key"));
+        let component_file_path = vec![dir.join("tls.cert"), dir.join("tls.key")];
         let component_config =
             ComponentConfig::new(component_file_path, ComponentKey::from("http"));
         std::fs::create_dir(&dir).unwrap();
         let mut file = File::create(&file_path).unwrap();
 
         let (signal_tx, signal_rx) = broadcast::channel(128);
-        spawn_thread(watcher_conf, signal_tx, &[dir], component_file_path, delay).unwrap();
+        spawn_thread(watcher_conf, signal_tx, &[dir], vec![component_config], delay).unwrap();
 
         if !test(&mut file, delay * 5, signal_rx).await {
             panic!("Test timed out");
@@ -233,7 +232,7 @@ mod tests {
         let watcher_conf = WatcherConfig::RecommendedWatcher;
 
         let (signal_tx, signal_rx) = broadcast::channel(128);
-        spawn_thread(watcher_conf, signal_tx, &[file_path], delay).unwrap();
+        spawn_thread(watcher_conf, signal_tx, &[file_path], vec![], delay).unwrap();
 
         if !test(&mut file, delay * 5, signal_rx).await {
             panic!("Test timed out");
@@ -254,7 +253,7 @@ mod tests {
         let watcher_conf = WatcherConfig::RecommendedWatcher;
 
         let (signal_tx, signal_rx) = broadcast::channel(128);
-        spawn_thread(watcher_conf, signal_tx, &[sym_file], delay).unwrap();
+        spawn_thread(watcher_conf, signal_tx, &[sym_file], vec![], delay).unwrap();
 
         if !test(&mut file, delay * 5, signal_rx).await {
             panic!("Test timed out");
@@ -275,7 +274,7 @@ mod tests {
         let mut file = File::create(&file_path).unwrap();
 
         let (signal_tx, signal_rx) = broadcast::channel(128);
-        spawn_thread(watcher_conf, signal_tx, &[sub_dir], delay).unwrap();
+        spawn_thread(watcher_conf, signal_tx, &[sub_dir], vec![], delay).unwrap();
 
         if !test(&mut file, delay * 5, signal_rx).await {
             panic!("Test timed out");

diff --git a/src/topology/running.rs b/src/topology/running.rs
@@ -548,9 +548,8 @@ impl RunningTopology {
             }))
             .collect::<Vec<_>>();
 
-        match components_to_reload {
-            Some(mut components) => sinks_to_change.append(&mut components),
-            _ => (),
+        if let Some(mut components) = components_to_reload {
+            sinks_to_change.append(&mut components)
         }
 
         for key in &sinks_to_change {

diff --git a/src/topology/test/doesnt_reload.rs b/src/topology/test/doesnt_reload.rs
@@ -23,7 +23,7 @@ async fn topology_doesnt_reload_new_data_dir() {
     new_config.global.data_dir = Some(Path::new("/qwerty").to_path_buf());
 
     topology
-        .reload_config_and_respawn(new_config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(new_config.build().unwrap(), Default::default(), None)
         .await
         .unwrap();
 

diff --git a/src/topology/test/mod.rs b/src/topology/test/mod.rs
@@ -301,7 +301,7 @@ async fn topology_remove_one_source() {
     config.add_sink("out1", &["in1"], sink1);
 
     assert!(topology
-        .reload_config_and_respawn(config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(config.build().unwrap(), Default::default(), None)
         .await
         .unwrap());
 
@@ -350,7 +350,7 @@ async fn topology_remove_one_sink() {
     config.add_sink("out1", &["in1"], basic_sink(10).1);
 
     assert!(topology
-        .reload_config_and_respawn(config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(config.build().unwrap(), Default::default(), None)
         .await
         .unwrap());
 
@@ -403,7 +403,7 @@ async fn topology_remove_one_transform() {
     config.add_sink("out1", &["t2"], sink2);
 
     assert!(topology
-        .reload_config_and_respawn(config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(config.build().unwrap(), Default::default(), None)
         .await
         .unwrap());
 
@@ -452,7 +452,7 @@ async fn topology_swap_source() {
     config.add_sink("out1", &["in2"], sink2);
 
     assert!(topology
-        .reload_config_and_respawn(config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(config.build().unwrap(), Default::default(), None)
         .await
         .unwrap());
 
@@ -517,7 +517,7 @@ async fn topology_swap_transform() {
     config.add_sink("out1", &["t1"], sink2);
 
     assert!(topology
-        .reload_config_and_respawn(config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(config.build().unwrap(), Default::default(), None)
         .await
         .unwrap());
 
@@ -569,7 +569,7 @@ async fn topology_swap_sink() {
     config.add_sink("out1", &["in1"], sink2);
 
     assert!(topology
-        .reload_config_and_respawn(config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(config.build().unwrap(), Default::default(), None)
         .await
         .unwrap());
 
@@ -657,7 +657,7 @@ async fn topology_swap_transform_is_atomic() {
     config.add_sink("out1", &["t1"], basic_sink(10).1);
 
     assert!(topology
-        .reload_config_and_respawn(config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(config.build().unwrap(), Default::default(), None)
         .await
         .unwrap());
 
@@ -693,7 +693,7 @@ async fn topology_rebuild_connected() {
     config.add_sink("out1", &["in1"], sink1);
 
     assert!(topology
-        .reload_config_and_respawn(config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(config.build().unwrap(), Default::default(), None)
         .await
         .unwrap());
 
@@ -752,7 +752,7 @@ async fn topology_rebuild_connected_transform() {
     config.add_sink("out1", &["t2"], sink2);
 
     assert!(topology
-        .reload_config_and_respawn(config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(config.build().unwrap(), Default::default(), None)
         .await
         .unwrap());
 
@@ -807,7 +807,7 @@ async fn topology_optional_healthcheck_does_not_fail_reload() {
     let (mut topology, _) = start_topology(config, false).await;
     let config = basic_config_with_sink_failing_healthcheck();
     assert!(topology
-        .reload_config_and_respawn(config, Default::default())
+        .reload_config_and_respawn(config, Default::default(), None)
         .await
         .unwrap());
 }
@@ -820,7 +820,7 @@ async fn topology_healthcheck_not_run_on_unchanged_reload() {
     let mut config = basic_config_with_sink_failing_healthcheck();
     config.healthchecks.require_healthy = true;
     assert!(topology
-        .reload_config_and_respawn(config, Default::default())
+        .reload_config_and_respawn(config, Default::default(), None)
         .await
         .unwrap());
 }
@@ -846,7 +846,7 @@ async fn topology_healthcheck_run_for_changes_on_reload() {
     let mut config = config.build().unwrap();
     config.healthchecks.require_healthy = true;
     assert!(!topology
-        .reload_config_and_respawn(config, Default::default())
+        .reload_config_and_respawn(config, Default::default(), None)
         .await
         .unwrap());
 }

diff --git a/src/topology/test/reload.rs b/src/topology/test/reload.rs
@@ -65,7 +65,7 @@ async fn topology_reuse_old_port() {
 
     let (mut topology, _) = start_topology(old_config.build().unwrap(), false).await;
     assert!(topology
-        .reload_config_and_respawn(new_config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(new_config.build().unwrap(), Default::default(), None)
         .await
         .unwrap());
 }
@@ -90,7 +90,7 @@ async fn topology_rebuild_old() {
 
     let (mut topology, _) = start_topology(old_config.build().unwrap(), false).await;
     assert!(!topology
-        .reload_config_and_respawn(new_config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(new_config.build().unwrap(), Default::default(), None)
         .await
         .unwrap());
 }
@@ -107,7 +107,7 @@ async fn topology_old() {
 
     let (mut topology, _) = start_topology(old_config.clone().build().unwrap(), false).await;
     assert!(topology
-        .reload_config_and_respawn(old_config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(old_config.build().unwrap(), Default::default(), None)
         .await
         .unwrap());
 }
@@ -258,7 +258,7 @@ async fn topology_readd_input() {
     new_config.add_source("in2", internal_metrics_source());
     new_config.add_sink("out", &["in1"], prom_exporter_sink(address_0, 1));
     assert!(topology
-        .reload_config_and_respawn(new_config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(new_config.build().unwrap(), Default::default(), None)
         .await
         .unwrap());
 
@@ -268,7 +268,7 @@ async fn topology_readd_input() {
     new_config.add_source("in2", internal_metrics_source());
     new_config.add_sink("out", &["in1", "in2"], prom_exporter_sink(address_0, 1));
     assert!(topology
-        .reload_config_and_respawn(new_config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(new_config.build().unwrap(), Default::default(), None)
         .await
         .unwrap());
 
@@ -299,7 +299,7 @@ async fn reload_sink_test(
 
     // Now reload the topology with the "new" configuration, and make sure that a component is now listening on `new_address`.
     assert!(topology
-        .reload_config_and_respawn(new_config, Default::default())
+        .reload_config_and_respawn(new_config, Default::default(), None)
         .await
         .unwrap());
 

diff --git a/src/topology/test/transient_state.rs b/src/topology/test/transient_state.rs
@@ -30,7 +30,7 @@ async fn closed_source() {
     topology.sources_finished().await;
 
     assert!(topology
-        .reload_config_and_respawn(new_config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(new_config.build().unwrap(), Default::default(), None)
         .await
         .unwrap());
 }
@@ -52,7 +52,7 @@ async fn remove_sink() {
 
     let (mut topology, _) = start_topology(old_config.build().unwrap(), false).await;
     assert!(topology
-        .reload_config_and_respawn(new_config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(new_config.build().unwrap(), Default::default(), None)
         .await
         .unwrap());
 }
@@ -75,7 +75,7 @@ async fn remove_transform() {
 
     let (mut topology, _) = start_topology(old_config.build().unwrap(), false).await;
     assert!(topology
-        .reload_config_and_respawn(new_config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(new_config.build().unwrap(), Default::default(), None)
         .await
         .unwrap());
 }
@@ -99,7 +99,7 @@ async fn replace_transform() {
 
     let (mut topology, _) = start_topology(old_config.build().unwrap(), false).await;
     assert!(topology
-        .reload_config_and_respawn(new_config.build().unwrap(), Default::default())
+        .reload_config_and_respawn(new_config.build().unwrap(), Default::default(), None)
         .await
         .unwrap());
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,7 @@ impl ComponentKey { @@
     impl AsRef<ComponentKey> for ComponentKey {
         fn as_ref(&self) -> &ComponentKey {
-            &self
+            self
         }
     }
@@ Expand Down @@