Merge remote-tracking branch 'origin/master' into issue-163-elapsed-time

10 files changed, 29 insertions, 27 deletions

diff --git a/src/display/components/display_bandwidth.rs b/src/display/components/display_bandwidth.rs
index dcc204c..04f1e89 100644
--- a/src/display/components/display_bandwidth.rs
+++ b/src/display/components/display_bandwidth.rs
@@ -8,7 +8,9 @@ pub struct DisplayBandwidth {
 impl fmt::Display for DisplayBandwidth {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let suffix = if self.as_rate { "ps" } else { "" };
-        if self.bandwidth > 999_999_999.0 {
+        if self.bandwidth > 999_999_999_999.0 {
+            write!(f, "{:.2}TB{}", self.bandwidth / 1_000_000_000_000.0, suffix)
+        } else if self.bandwidth > 999_999_999.0 {
             write!(f, "{:.2}GB{}", self.bandwidth / 1_000_000_000.0, suffix)
         } else if self.bandwidth > 999_999.0 {
             write!(f, "{:.2}MB{}", self.bandwidth / 1_000_000.0, suffix)
diff --git a/src/display/ui_state.rs b/src/display/ui_state.rs
index a65e610..8872cd8 100644
--- a/src/display/ui_state.rs
+++ b/src/display/ui_state.rs
@@ -131,7 +131,7 @@ impl UIState {
 
             for (connection, connection_info) in &network_utilization.connections {
                 let connection_previously_seen = !seen_connections.insert(connection);
-                let connection_data = connections.entry(connection.clone()).or_default();
+                let connection_data = connections.entry(*connection).or_default();
                 let data_for_remote_address = remote_addresses
                     .entry(connection.remote_socket.ip)
                     .or_default();
diff --git a/src/main.rs b/src/main.rs
index 0ecd3ac..62c9621 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -13,7 +13,7 @@ use network::{
 };
 use os::OnSigWinch;
 
-use ::pnet_bandwhich_fork::datalink::{DataLinkReceiver, NetworkInterface};
+use ::pnet::datalink::{DataLinkReceiver, NetworkInterface};
 use ::std::collections::HashMap;
 use ::std::sync::atomic::{AtomicBool, Ordering};
 use ::std::sync::{Arc, Mutex};
diff --git a/src/network/dns/client.rs b/src/network/dns/client.rs
index 9e13604..c3ed96c 100644
--- a/src/network/dns/client.rs
+++ b/src/network/dns/client.rs
@@ -69,7 +69,7 @@ impl Client {
         // Remove ips that are already being resolved
         let ips = ips
             .into_iter()
-            .filter(|ip| self.pending.lock().unwrap().insert(ip.clone()))
+            .filter(|ip| self.pending.lock().unwrap().insert(*ip))
             .collect::<Vec<_>>();
 
         if !ips.is_empty() {
diff --git a/src/network/sniffer.rs b/src/network/sniffer.rs
index 9d44275..52014b8 100644
--- a/src/network/sniffer.rs
+++ b/src/network/sniffer.rs
@@ -1,13 +1,13 @@
 use ::std::boxed::Box;
 
-use ::pnet_bandwhich_fork::datalink::{DataLinkReceiver, NetworkInterface};
-use ::pnet_bandwhich_fork::packet::ethernet::{EtherTypes, EthernetPacket};
-use ::pnet_bandwhich_fork::packet::ip::{IpNextHeaderProtocol, IpNextHeaderProtocols};
-use ::pnet_bandwhich_fork::packet::ipv4::Ipv4Packet;
-use ::pnet_bandwhich_fork::packet::ipv6::Ipv6Packet;
-use ::pnet_bandwhich_fork::packet::tcp::TcpPacket;
-use ::pnet_bandwhich_fork::packet::udp::UdpPacket;
-use ::pnet_bandwhich_fork::packet::Packet;
+use ::pnet::datalink::{DataLinkReceiver, NetworkInterface};
+use ::pnet::packet::ethernet::{EtherTypes, EthernetPacket};
+use ::pnet::packet::ip::{IpNextHeaderProtocol, IpNextHeaderProtocols};
+use ::pnet::packet::ipv4::Ipv4Packet;
+use ::pnet::packet::ipv6::Ipv6Packet;
+use ::pnet::packet::tcp::TcpPacket;
+use ::pnet::packet::udp::UdpPacket;
+use ::pnet::packet::Packet;
 
 use ::ipnetwork::IpNetwork;
 use ::std::net::{IpAddr, SocketAddr};
diff --git a/src/os/shared.rs b/src/os/shared.rs
index 5d3360b..462f269 100644
--- a/src/os/shared.rs
+++ b/src/os/shared.rs
@@ -1,6 +1,6 @@
-use ::pnet_bandwhich_fork::datalink::Channel::Ethernet;
-use ::pnet_bandwhich_fork::datalink::DataLinkReceiver;
-use ::pnet_bandwhich_fork::datalink::{self, Config, NetworkInterface};
+use ::pnet::datalink::Channel::Ethernet;
+use ::pnet::datalink::DataLinkReceiver;
+use ::pnet::datalink::{self, Config, NetworkInterface};
 use ::std::io::{self, stdin, ErrorKind, Write};
 use ::termion::event::Event;
 use ::termion::input::TermRead;
diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs
index 636abb1..3b4453f 100644
--- a/src/tests/cases/raw_mode.rs
+++ b/src/tests/cases/raw_mode.rs
@@ -8,8 +8,8 @@ use ::std::net::IpAddr;
 
 use packet_builder::payload::PayloadData;
 use packet_builder::*;
-use pnet_bandwhich_fork::datalink::DataLinkReceiver;
-use pnet_bandwhich_fork::packet::Packet;
+use pnet::datalink::DataLinkReceiver;
+use pnet::packet::Packet;
 
 use crate::tests::cases::test_utils::{
     build_tcp_packet, opts_raw, os_input_output_dns, os_input_output_stdout, test_backend_factory,
diff --git a/src/tests/cases/test_utils.rs b/src/tests/cases/test_utils.rs
index aba5bc8..50cd30e 100644
--- a/src/tests/cases/test_utils.rs
+++ b/src/tests/cases/test_utils.rs
@@ -8,13 +8,13 @@ use crate::network::dns::Client;
 use crate::{Opt, OsInputOutput, RenderOpts};
 use ::termion::event::{Event, Key};
 use packet_builder::*;
-use pnet_bandwhich_fork::datalink::DataLinkReceiver;
+use pnet::datalink::DataLinkReceiver;
 use std::collections::HashMap;
 use std::io::Write;
 use std::sync::{Arc, Mutex};
 
 use packet_builder::payload::PayloadData;
-use pnet_bandwhich_fork::packet::Packet;
+use pnet::packet::Packet;
 use pnet_base::MacAddr;
 
 pub fn sleep_and_quit_events(sleep_num: usize) -> Box<KeyboardEvents> {
@@ -121,7 +121,7 @@ pub fn os_input_output_factory(
                 writeln!(&mut stdout, "{}", output).unwrap();
             }
         }),
-        None => Box::new({ move |_output: String| {} }),
+        None => Box::new(move |_output: String| {}),
     };
 
     OsInputOutput {
diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs
index 8125879..50e8cd0 100644
--- a/src/tests/cases/ui.rs
+++ b/src/tests/cases/ui.rs
@@ -13,7 +13,7 @@ use crate::tests::cases::test_utils::{
     sleep_and_quit_events, test_backend_factory,
 };
 use ::termion::event::{Event, Key};
-use pnet_bandwhich_fork::datalink::DataLinkReceiver;
+use pnet::datalink::DataLinkReceiver;
 use std::iter;
 
 use crate::tests::fakes::KeyboardEvents;
@@ -1012,7 +1012,7 @@ fn traffic_with_host_names() {
     let dns_client = create_fake_dns_client(ips_to_hostnames);
     let on_winch = create_fake_on_winch(false);
     let cleanup = Box::new(|| {});
-    let write_to_stdout = Box::new({ move |_output: String| {} });
+    let write_to_stdout = Box::new(move |_output: String| {});
 
     let os_input = OsInputOutput {
         network_interfaces: get_interfaces(),
@@ -1121,7 +1121,7 @@ fn truncate_long_hostnames() {
     let dns_client = create_fake_dns_client(ips_to_hostnames);
     let on_winch = create_fake_on_winch(false);
     let cleanup = Box::new(|| {});
-    let write_to_stdout = Box::new({ move |_output: String| {} });
+    let write_to_stdout = Box::new(move |_output: String| {});
 
     let os_input = OsInputOutput {
         network_interfaces: get_interfaces(),
@@ -1229,7 +1229,7 @@ fn no_resolve_mode() {
     let dns_client = None;
     let on_winch = create_fake_on_winch(false);
     let cleanup = Box::new(|| {});
-    let write_to_stdout = Box::new({ move |_output: String| {} });
+    let write_to_stdout = Box::new(move |_output: String| {});
 
     let os_input = OsInputOutput {
         network_interfaces: get_interfaces(),
@@ -1273,7 +1273,7 @@ fn traffic_with_winch_event() {
     let dns_client = create_fake_dns_client(HashMap::new());
     let on_winch = create_fake_on_winch(true);
     let cleanup = Box::new(|| {});
-    let write_to_stdout = Box::new({ move |_output: String| {} });
+    let write_to_stdout = Box::new(move |_output: String| {});
 
     let os_input = OsInputOutput {
         network_interfaces: get_interfaces(),
diff --git a/src/tests/fakes/fake_input.rs b/src/tests/fakes/fake_input.rs
index 3290ac2..b0f7d19 100644
--- a/src/tests/fakes/fake_input.rs
+++ b/src/tests/fakes/fake_input.rs
@@ -1,7 +1,7 @@
 use ::async_trait::async_trait;
 use ::ipnetwork::IpNetwork;
-use ::pnet_bandwhich_fork::datalink::DataLinkReceiver;
-use ::pnet_bandwhich_fork::datalink::NetworkInterface;
+use ::pnet::datalink::DataLinkReceiver;
+use ::pnet::datalink::NetworkInterface;
 use ::std::collections::HashMap;
 use ::std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use ::std::{thread, time};