diff options
author | cyqsimon <28627918+cyqsimon@users.noreply.github.com> | 2023-08-25 19:54:05 +0800 |
---|---|---|
committer | cyqsimon <28627918+cyqsimon@users.noreply.github.com> | 2023-08-25 19:54:05 +0800 |
commit | e9aa59fa0e056dc4b51083eb21f9d2a1f851b29d (patch) | |
tree | 24e8420cc70930e19aaeb1447f537e4bd680dea4 /src/os | |
parent | dab19856704972d036252d101c754cc3fc2d85dc (diff) |
Compact imports
Diffstat (limited to 'src/os')
-rw-r--r-- | src/os/linux.rs | 18 | ||||
-rw-r--r-- | src/os/lsof.rs | 9 | ||||
-rw-r--r-- | src/os/lsof_utils.rs | 8 | ||||
-rw-r--r-- | src/os/shared.rs | 21 | ||||
-rw-r--r-- | src/os/windows.rs | 6 |
5 files changed, 30 insertions, 32 deletions
diff --git a/src/os/linux.rs b/src/os/linux.rs index 5dd5c2b..d1813ab 100644 --- a/src/os/linux.rs +++ b/src/os/linux.rs @@ -1,9 +1,11 @@ -use ::std::collections::HashMap; +use std::collections::HashMap; -use ::procfs::process::FDTarget; +use procfs::process::FDTarget; -use crate::network::{LocalSocket, Protocol}; -use crate::OpenSockets; +use crate::{ + network::{LocalSocket, Protocol}, + OpenSockets, +}; pub(crate) fn get_open_sockets() -> OpenSockets { let mut open_sockets = HashMap::new(); @@ -22,8 +24,8 @@ pub(crate) fn get_open_sockets() -> OpenSockets { } } - if let Ok(mut tcp) = ::procfs::net::tcp() { - if let Ok(mut tcp6) = ::procfs::net::tcp6() { + if let Ok(mut tcp) = procfs::net::tcp() { + if let Ok(mut tcp6) = procfs::net::tcp6() { tcp.append(&mut tcp6); } for entry in tcp.into_iter() { @@ -40,8 +42,8 @@ pub(crate) fn get_open_sockets() -> OpenSockets { } } - if let Ok(mut udp) = ::procfs::net::udp() { - if let Ok(mut udp6) = ::procfs::net::udp6() { + if let Ok(mut udp) = procfs::net::udp() { + if let Ok(mut udp6) = procfs::net::udp6() { udp.append(&mut udp6); } for entry in udp.into_iter() { diff --git a/src/os/lsof.rs b/src/os/lsof.rs index 77331ed..f6d1e3f 100644 --- a/src/os/lsof.rs +++ b/src/os/lsof.rs @@ -1,14 +1,11 @@ -use ::std::collections::HashMap; +use std::collections::HashMap; -use crate::network::LocalSocket; -use crate::OpenSockets; - -use super::lsof_utils; +use crate::{network::LocalSocket, os::lsof_utils::get_connections, OpenSockets}; pub(crate) fn get_open_sockets() -> OpenSockets { let mut open_sockets = HashMap::new(); - let connections = lsof_utils::get_connections(); + let connections = get_connections(); for raw_connection in connections { open_sockets.insert( diff --git a/src/os/lsof_utils.rs b/src/os/lsof_utils.rs index 46fe8fc..5e5b8c9 100644 --- a/src/os/lsof_utils.rs +++ b/src/os/lsof_utils.rs @@ -1,9 +1,9 @@ -use crate::network::Protocol; +use std::{ffi::OsStr, net::IpAddr, process::Command}; + use lazy_static::lazy_static; use regex::Regex; -use std::ffi::OsStr; -use std::net::IpAddr; -use std::process::Command; + +use crate::network::Protocol; #[allow(dead_code)] #[derive(Debug, Clone)] diff --git a/src/os/shared.rs b/src/os/shared.rs index f8d997d..ee3415a 100644 --- a/src/os/shared.rs +++ b/src/os/shared.rs @@ -1,15 +1,14 @@ -use ::crossterm::event::read; -use ::crossterm::event::Event; -use ::pnet::datalink::Channel::Ethernet; -use ::pnet::datalink::DataLinkReceiver; -use ::pnet::datalink::{self, Config, NetworkInterface}; -use ::std::io::{self, ErrorKind, Write}; -use ::tokio::runtime::Runtime; +use std::{ + io::{self, ErrorKind, Write}, + net::Ipv4Addr, + time, +}; -use ::std::net::Ipv4Addr; -use ::std::time; +use crossterm::event::{read, Event}; +use pnet::datalink::{self, Channel::Ethernet, Config, DataLinkReceiver, NetworkInterface}; +use tokio::runtime::Runtime; -use crate::os::errors::GetInterfaceError; +use crate::{network::dns, os::errors::GetInterfaceError, OsInputOutput}; #[cfg(target_os = "linux")] use crate::os::linux::get_open_sockets; @@ -18,8 +17,6 @@ use crate::os::lsof::get_open_sockets; #[cfg(target_os = "windows")] use crate::os::windows::get_open_sockets; -use crate::{network::dns, OsInputOutput}; - pub struct TerminalEvents; impl Iterator for TerminalEvents { diff --git a/src/os/windows.rs b/src/os/windows.rs index 5bb6118..5c72400 100644 --- a/src/os/windows.rs +++ b/src/os/windows.rs @@ -3,8 +3,10 @@ use std::collections::HashMap; use netstat2::*; use sysinfo::{Pid, PidExt, ProcessExt, System, SystemExt}; -use crate::network::{LocalSocket, Protocol}; -use crate::OpenSockets; +use crate::{ + network::{LocalSocket, Protocol}, + OpenSockets, +}; pub(crate) fn get_open_sockets() -> OpenSockets { let mut open_sockets = HashMap::new(); |