Do not copy values

Author: Nickid2018

src/analyze/favicon.rs

@@ -11,8 +11,8 @@ pub struct FaviconArgs {
     favicon: Option<String>,
 }
 
-pub struct Favicon {
-    favicon: Option<String>,
+pub struct Favicon<'a> {
+    args: &'a FaviconArgs,
 }
 
 async fn do_favicon_output(favicon: &str, output: &str) -> std::io::Result<()> {
@@ -24,15 +24,15 @@ async fn do_favicon_output(favicon: &str, output: &str) -> std::io::Result<()> {
 }
 
 #[async_trait]
-impl Analyzer for Favicon {
+impl Analyzer for Favicon<'_> {
     fn enabled(&self, payload: &StatusPayload) -> bool {
-        self.favicon.is_some() && payload.favicon.is_some()
+        self.args.favicon.is_some() && payload.favicon.is_some()
     }
 
     async fn analyze(&self, payload: &StatusPayload) {
         match do_favicon_output(
             &payload.favicon.as_ref().unwrap(),
-            &self.favicon.as_ref().unwrap(),
+            &self.args.favicon.as_ref().unwrap(),
         )
         .await
         {
@@ -42,10 +42,8 @@ impl Analyzer for Favicon {
     }
 }
 
-impl Favicon {
-    pub fn new(args: &FaviconArgs) -> Favicon {
-        Favicon {
-            favicon: args.favicon.clone(),
-        }
+impl Favicon<'_> {
+    pub fn new(args: &'_ FaviconArgs) -> Favicon<'_> {
+        Favicon { args }
     }
 }

src/analyze/mod.rs

@@ -51,11 +51,11 @@ pub trait Analyzer {
     async fn analyze(&self, payload: &StatusPayload);
 }
 
-pub struct AnalyzerTools {
-    analyzers: Vec<Box<dyn Analyzer>>,
+pub struct AnalyzerTools<'a> {
+    analyzers: Vec<Box<dyn Analyzer + 'a>>,
 }
 
-impl AnalyzerTools {
+impl AnalyzerTools<'_> {
     pub async fn analyze(&self, payload: &StatusPayload) {
         for analyzer in self.analyzers.iter() {
             if analyzer.enabled(&payload) {
@@ -86,7 +86,7 @@ pub struct AnalyzerArgs {
     favicon_args: FaviconArgs,
 }
 
-pub fn init_analyzer_tools(args: &AnalyzerArgs) -> AnalyzerTools {
+pub fn init_analyzer_tools<'a>(args: &'_ AnalyzerArgs) -> AnalyzerTools<'_> {
     let mut analyzers: Vec<Box<dyn Analyzer>> = Vec::new();
 
     if args.analyzers.contains(&AvailableAnalyzers::PING) {

src/analyze/player.rs

@@ -15,14 +15,12 @@ pub struct PlayerArgs {
     hide_anonymous: bool,
 }
 
-pub struct Player {
-    no_player_list: bool,
-    no_uuid: bool,
-    hide_anonymous: bool,
+pub struct Player<'a> {
+    args: &'a PlayerArgs,
 }
 
 #[async_trait]
-impl Analyzer for Player {
+impl Analyzer for Player<'_> {
     fn enabled(&self, payload: &StatusPayload) -> bool {
         payload.max_players.is_some() && payload.player_count.is_some()
     }
@@ -33,14 +31,15 @@ impl Analyzer for Player {
             payload.player_count.unwrap(),
             payload.max_players.unwrap()
         );
-        if !self.no_player_list
+        if !self.args.no_player_list
             && let Some(players) = payload.players.as_ref()
         {
             for player in players {
-                if self.hide_anonymous && player.uuid == "00000000-0000-0000-0000-000000000000" {
+                if self.args.hide_anonymous && player.uuid == "00000000-0000-0000-0000-000000000000"
+                {
                     continue;
                 }
-                if self.no_uuid {
+                if self.args.no_uuid {
                     log::info!("  {}", player.id);
                 } else {
                     log::info!("  {:20} ({})", player.id, player.uuid);
@@ -50,12 +49,8 @@ impl Analyzer for Player {
     }
 }
 
-impl Player {
-    pub fn new(args: &PlayerArgs) -> Player {
-        Player {
-            no_player_list: args.no_player_list,
-            no_uuid: args.no_uuid,
-            hide_anonymous: args.hide_anonymous,
-        }
+impl Player<'_> {
+    pub fn new(args: &'_ PlayerArgs) -> Player<'_> {
+        Player { args }
     }
 }

src/mode/java.rs

@@ -149,18 +149,17 @@ pub struct JavaModeArgs {
     pub protocol: i32,
 }
 
-pub struct JavaQuery {
-    pub no_srv: bool,
-    pub protocol: i32,
+pub struct JavaQuery<'a> {
+    args: &'a JavaModeArgs,
 }
 
 #[async_trait]
-impl QueryModeHandler for JavaQuery {
+impl QueryModeHandler for JavaQuery<'_> {
     async fn do_query(&self, addr: &str) -> std::io::Result<StatusPayload> {
         let mut je_res = resolve_addr(addr, 25565);
         let je_address = je_res.get_or_insert_default();
 
-        if !self.no_srv {
+        if !self.args.no_srv {
             let srv_res = resolve_server_srv(addr).await;
             let srv = srv_res
                 .iter()
@@ -169,15 +168,12 @@ impl QueryModeHandler for JavaQuery {
             je_address.splice(0..0, srv);
         }
 
-        check_java_server(je_address, self.protocol).await
+        check_java_server(je_address, self.args.protocol).await
     }
 }
 
-impl JavaQuery {
-    pub fn new(args: &JavaModeArgs) -> JavaQuery {
-        JavaQuery {
-            no_srv: args.no_srv,
-            protocol: args.protocol,
-        }
+impl JavaQuery<'_> {
+    pub fn new(args: &'_ JavaModeArgs) -> JavaQuery<'_> {
+        JavaQuery { args }
     }
 }

src/mode/legacy.rs

@@ -134,17 +134,17 @@ async fn check_legacy_server(addr_vec: &Vec<SocketAddr>) -> std::io::Result<Stat
     Err(std::io::Error::new(ErrorKind::NotFound, "No server found"))
 }
 
-pub struct LegacyQuery {
-    pub no_srv: bool,
+pub struct LegacyQuery<'a> {
+    args: &'a JavaModeArgs,
 }
 
 #[async_trait]
-impl QueryModeHandler for LegacyQuery {
+impl QueryModeHandler for LegacyQuery<'_> {
     async fn do_query(&self, addr: &str) -> std::io::Result<StatusPayload> {
         let mut res = resolve_addr(addr, 25565);
         let addrs = res.get_or_insert_default();
 
-        if !self.no_srv {
+        if !self.args.no_srv {
             let srv_res = resolve_server_srv(addr).await;
             let srv = srv_res
                 .iter()
@@ -157,10 +157,8 @@ impl QueryModeHandler for LegacyQuery {
     }
 }
 
-impl LegacyQuery {
-    pub fn new(args: &JavaModeArgs) -> LegacyQuery {
-        LegacyQuery {
-            no_srv: args.no_srv,
-        }
+impl LegacyQuery<'_> {
+    pub fn new(args: &'_ JavaModeArgs) -> LegacyQuery<'_> {
+        LegacyQuery { args }
     }
 }

src/mode/mod.rs

@@ -24,11 +24,11 @@ trait QueryModeHandler {
     async fn do_query(&self, addr: &str) -> std::io::Result<StatusPayload>;
 }
 
-pub struct QueryEngine {
-    modes: HashMap<QueryMode, Box<dyn QueryModeHandler>>,
+pub struct QueryEngine<'a> {
+    modes: HashMap<QueryMode, Box<dyn QueryModeHandler + 'a>>,
 }
 
-impl QueryEngine {
+impl QueryEngine<'_> {
     pub async fn query(&self, mode: QueryMode, addr: &str) -> std::io::Result<StatusPayload> {
         if let Some(handler) = self.modes.get(&mode) {
             handler.do_query(addr).await
@@ -47,7 +47,7 @@ pub struct ModeArgs {
     java: JavaModeArgs,
 }
 
-pub fn init_query_engine(args: &ModeArgs) -> QueryEngine {
+pub fn init_query_engine(args: &'_ ModeArgs) -> QueryEngine<'_> {
     let mut modes: HashMap<QueryMode, Box<dyn QueryModeHandler>> = HashMap::new();
     modes.insert(JAVA, Box::new(JavaQuery::new(&args.java)));
     modes.insert(LEGACY, Box::new(LegacyQuery::new(&args.java)));