From 9e6f390c1f34de0d0b413f4704fc2d1f655c47bc Mon Sep 17 00:00:00 2001 From: Eduardo Broto Date: Sat, 7 Dec 2019 21:24:57 +0100 Subject: chore(style): fix clippy errors --- src/display/components/table.rs | 2 +- src/display/ui.rs | 2 +- src/main.rs | 6 +++--- src/network/connection.rs | 4 ++-- src/network/sniffer.rs | 2 +- src/os/lsof_utils.rs | 2 +- src/os/shared.rs | 5 ++++- src/tests/cases/raw_mode.rs | 2 +- src/tests/fakes/fake_input.rs | 11 +++++++---- 9 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/display/components/table.rs b/src/display/components/table.rs index f59536e..74e207a 100644 --- a/src/display/components/table.rs +++ b/src/display/components/table.rs @@ -85,7 +85,7 @@ impl<'a> Table<'a> { .iter() .map(|(process_name, data_for_process)| { vec![ - process_name.to_string(), + (*process_name).to_string(), data_for_process.connection_count.to_string(), display_upload_and_download(*data_for_process), ] diff --git a/src/display/ui.rs b/src/display/ui.rs index f2e3f25..3fcb092 100644 --- a/src/display/ui.rs +++ b/src/display/ui.rs @@ -34,7 +34,7 @@ where ip_to_host: Default::default(), } } - pub fn output_text(&mut self, write_to_stdout: &mut Box) { + pub fn output_text(&mut self, write_to_stdout: &mut (dyn FnMut(String) + Send)) { let state = &self.state; let ip_to_host = &self.ip_to_host; let local_time: DateTime = Local::now(); diff --git a/src/main.rs b/src/main.rs index b4d46cf..9022cfa 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,6 +11,7 @@ use network::{ dns::{self, IpTable}, Connection, Sniffer, Utilization, }; +use os::OnSigWinch; use ::pnet::datalink::{DataLinkReceiver, NetworkInterface}; use ::std::collections::HashMap; @@ -82,12 +83,12 @@ pub struct OsInputOutput { pub get_open_sockets: fn() -> HashMap, pub keyboard_events: Box + Send>, pub dns_client: Option, - pub on_winch: Box) + Send>, + pub on_winch: Box, pub cleanup: Box, pub write_to_stdout: Box, } -pub fn start<'a, B>(terminal_backend: B, os_input: OsInputOutput, opts: Opt) +pub fn start(terminal_backend: B, os_input: OsInputOutput, opts: Opt) where B: Backend + Send + 'static, { @@ -132,7 +133,6 @@ where .spawn({ let running = running.clone(); let network_utilization = network_utilization.clone(); - let ui = ui.clone(); move || { while running.load(Ordering::Acquire) { let render_start_time = Instant::now(); diff --git a/src/network/connection.rs b/src/network/connection.rs index 75edf86..f931d54 100644 --- a/src/network/connection.rs +++ b/src/network/connection.rs @@ -11,8 +11,8 @@ pub enum Protocol { } impl Protocol { - pub fn from_string(string: &String) -> Option { - match string.as_str() { + pub fn from_str(string: &str) -> Option { + match string { "TCP" => Some(Protocol::Tcp), "UDP" => Some(Protocol::Udp), _ => None, diff --git a/src/network/sniffer.rs b/src/network/sniffer.rs index 0d68a20..3ec6886 100644 --- a/src/network/sniffer.rs +++ b/src/network/sniffer.rs @@ -26,7 +26,7 @@ pub enum Direction { } impl Direction { - pub fn new(network_interface_ips: &Vec, ip_packet: &Ipv4Packet) -> Self { + pub fn new(network_interface_ips: &[IpNetwork], ip_packet: &Ipv4Packet) -> Self { if network_interface_ips .iter() .any(|ip_network| ip_network.ip() == ip_packet.get_source()) diff --git a/src/os/lsof_utils.rs b/src/os/lsof_utils.rs index 9f6b479..93d68fe 100644 --- a/src/os/lsof_utils.rs +++ b/src/os/lsof_utils.rs @@ -45,7 +45,7 @@ impl RawConnection { } pub fn get_protocol(&self) -> Protocol { - return Protocol::from_string(&self.protocol).unwrap(); + return Protocol::from_str(&self.protocol).unwrap(); } pub fn get_ip_address(&self) -> IpAddr { diff --git a/src/os/shared.rs b/src/os/shared.rs index 313b941..8947ecb 100644 --- a/src/os/shared.rs +++ b/src/os/shared.rs @@ -15,6 +15,9 @@ use crate::os::linux::get_open_sockets; use crate::os::macos::get_open_sockets; use crate::{network::dns, OsInputOutput}; +pub type OnSigWinch = dyn Fn(Box) + Send; +pub type SigCleanup = dyn Fn() + Send; + pub struct KeyboardEvents; impl Iterator for KeyboardEvents { @@ -45,7 +48,7 @@ fn get_interface(interface_name: &str) -> Option { .find(|iface| iface.name == interface_name) } -fn sigwinch() -> (Box) + Send>, Box) { +fn sigwinch() -> (Box, Box) { let signals = Signals::new(&[signal_hook::SIGWINCH]).unwrap(); let on_winch = { let signals = signals.clone(); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs index 26a1801..f0989ca 100644 --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -37,7 +37,7 @@ fn build_tcp_packet( pkt.packet().to_vec() } -fn format_raw_output<'t>(output: Vec) -> String { +fn format_raw_output(output: Vec) -> String { let stdout_utf8 = String::from_utf8(output).unwrap(); use regex::Regex; let timestamp = Regex::new(r"<\d+>").unwrap(); diff --git a/src/tests/fakes/fake_input.rs b/src/tests/fakes/fake_input.rs index 889e708..b3b089b 100644 --- a/src/tests/fakes/fake_input.rs +++ b/src/tests/fakes/fake_input.rs @@ -10,9 +10,12 @@ use ::std::task::{Context, Poll}; use ::std::{thread, time}; use ::termion::event::Event; -use crate::network::{ - dns::{self, Lookup}, - Connection, Protocol, +use crate::{ + network::{ + dns::{self, Lookup}, + Connection, Protocol, + }, + os::OnSigWinch, }; pub struct KeyboardEvents { @@ -142,7 +145,7 @@ pub fn get_interface() -> NetworkInterface { } } -pub fn create_fake_on_winch(should_send_winch_event: bool) -> Box) + Send> { +pub fn create_fake_on_winch(should_send_winch_event: bool) -> Box { Box::new(move |cb| { if should_send_winch_event { thread::sleep(time::Duration::from_millis(900)); -- cgit v1.2.3