diff --git a/build.rs b/build.rs index 410ffeb..63cc0ea 100644 --- a/build.rs +++ b/build.rs @@ -141,7 +141,7 @@ fn ports_v(fp_map: &BTreeMap) -> BTreeMap> { } else if !segment.is_empty() { match segment.parse::() { Ok(port) => port_list.push(port), - Err(_) => println!("Error parsing port: {}", segment), + Err(_) => println!("Error parsing port: {segment}"), } } } diff --git a/src/main.rs b/src/main.rs index 52a998d..f802987 100644 --- a/src/main.rs +++ b/src/main.rs @@ -46,7 +46,7 @@ fn main() { let config = Config::read(opts.config_path.clone()); opts.merge(&config); - debug!("Main() `opts` arguments are {:?}", opts); + debug!("Main() `opts` arguments are {opts:?}"); let scripts_to_run: Vec = match init_scripts(&opts.scripts) { Ok(scripts_to_run) => scripts_to_run, @@ -94,7 +94,7 @@ fn main() { opts.exclude_ports.unwrap_or_default(), opts.udp, ); - debug!("Scanner finished building: {:?}", scanner); + debug!("Scanner finished building: {scanner:?}"); let mut portscan_bench = NamedTimer::start("Portscan"); let scan_result = block_on(scanner.run()); @@ -146,7 +146,7 @@ fn main() { // This part allows us to add commandline arguments to the Script call_format, appending them to the end of the command. if !opts.command.is_empty() { let user_extra_args = &opts.command.join(" "); - debug!("Extra args vec {:?}", user_extra_args); + debug!("Extra args vec {user_extra_args:?}"); if script_f.call_format.is_some() { let mut call_f = script_f.call_format.unwrap(); call_f.push(' '); @@ -156,7 +156,7 @@ fn main() { opts.greppable, opts.accessible ); - debug!("Call format {}", call_f); + debug!("Call format {call_f}"); script_f.call_format = Some(call_f); } } @@ -187,7 +187,7 @@ fn main() { benchmarks.push(script_bench); rustscan_bench.end(); benchmarks.push(rustscan_bench); - debug!("Benchmarks raw {:?}", benchmarks); + debug!("Benchmarks raw {benchmarks:?}"); info!("{}", benchmarks.summary()); } diff --git a/src/scanner/mod.rs b/src/scanner/mod.rs index 8d52fde..92038ea 100644 --- a/src/scanner/mod.rs +++ b/src/scanner/mod.rs @@ -112,7 +112,7 @@ impl Scanner { } } } - debug!("Typical socket connection errors {:?}", errors); + debug!("Typical socket connection errors {errors:?}"); debug!("Open Sockets found: {:?}", &open_sockets); open_sockets } @@ -153,7 +153,7 @@ impl Scanner { } self.fmt_ports(socket); - debug!("Return Ok after {} tries", nr_try); + debug!("Return Ok after {nr_try} tries"); return Ok(socket); } Err(e) => { @@ -164,7 +164,7 @@ impl Scanner { if nr_try == tries { error_string.push(' '); error_string.push_str(&socket.ip().to_string()); - return Err(io::Error::new(io::ErrorKind::Other, error_string)); + return Err(io::Error::other(error_string)); } } }; @@ -193,10 +193,9 @@ impl Scanner { } } - Err(io::Error::new( - io::ErrorKind::Other, - format!("UDP scan timed-out for all tries on socket {}", socket), - )) + Err(io::Error::other(format!( + "UDP scan timed-out for all tries on socket {socket}" + ))) } /// Performs the connection to the socket with timeout @@ -275,7 +274,7 @@ impl Scanner { match io::timeout(wait, udp_socket.recv(&mut buf)).await { Ok(size) => { - debug!("Received {} bytes", size); + debug!("Received {size} bytes"); self.fmt_ports(socket); Ok(true) } @@ -289,7 +288,7 @@ impl Scanner { } } Err(e) => { - println!("Err E binding sock {:?}", e); + println!("Err E binding sock {e:?}"); Err(e) } } diff --git a/src/scripts/mod.rs b/src/scripts/mod.rs index e21b427..455d024 100644 --- a/src/scripts/mod.rs +++ b/src/scripts/mod.rs @@ -109,7 +109,7 @@ pub fn init_scripts(scripts: &ScriptsRequired) -> Result> { } ScriptsRequired::Custom => { let script_config = ScriptConfig::read_config()?; - debug!("Script config \n{:?}", script_config); + debug!("Script config \n{script_config:?}"); let script_dir_base = if let Some(config_directory) = &script_config.directory { PathBuf::from(config_directory) @@ -118,10 +118,10 @@ pub fn init_scripts(scripts: &ScriptsRequired) -> Result> { }; let script_paths = find_scripts(script_dir_base)?; - debug!("Scripts paths \n{:?}", script_paths); + debug!("Scripts paths \n{script_paths:?}"); let parsed_scripts = parse_scripts(script_paths); - debug!("Scripts parsed \n{:?}", parsed_scripts); + debug!("Scripts parsed \n{parsed_scripts:?}"); // Only Scripts that contain all the tags found in ScriptConfig will be selected. if let Some(config_hashset) = script_config.tags { @@ -142,7 +142,7 @@ pub fn init_scripts(scripts: &ScriptsRequired) -> Result> { } } } - debug!("\nScript(s) to run {:?}", scripts_to_run); + debug!("\nScript(s) to run {scripts_to_run:?}"); } } @@ -269,14 +269,14 @@ impl Script { }; to_run = default_template.fill_with_struct(&exec_parts)?; } - debug!("\nScript format to run {}", to_run); + debug!("\nScript format to run {to_run}"); execute_script(&to_run) } } #[cfg(not(tarpaulin_include))] fn execute_script(script: &str) -> Result { - debug!("\nScript arguments {}", script); + debug!("\nScript arguments {script}"); let (cmd, arg) = if cfg!(unix) { ("sh", "-c") @@ -314,7 +314,7 @@ fn execute_script(script: &str) -> Result { Ok(String::from_utf8_lossy(&output.stdout).into_owned()) } Err(error) => { - debug!("Command error {}", error.to_string()); + debug!("Command error {error}",); Err(anyhow!(error.to_string())) } } @@ -373,7 +373,7 @@ impl ScriptFile { Some(parsed) } Err(e) => { - debug!("Failed to parse ScriptFile headers {}", e.to_string()); + debug!("Failed to parse ScriptFile headers {e}"); None } }