From c5ed599ef3859686ca31359cae47224588dec81f Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 22 Sep 2021 10:59:51 -0400 Subject: [PATCH] . --- network-hypervisor/src/vl1/dictionary.rs | 2 +- network-hypervisor/src/vl1/fragmentedpacket.rs | 1 - network-hypervisor/src/vl1/mod.rs | 2 +- network-hypervisor/src/vl1/node.rs | 2 +- network-hypervisor/src/vl1/{whois.rs => whoisqueue.rs} | 0 5 files changed, 3 insertions(+), 4 deletions(-) rename network-hypervisor/src/vl1/{whois.rs => whoisqueue.rs} (100%) diff --git a/network-hypervisor/src/vl1/dictionary.rs b/network-hypervisor/src/vl1/dictionary.rs index 06433a81d..56f84e6ed 100644 --- a/network-hypervisor/src/vl1/dictionary.rs +++ b/network-hypervisor/src/vl1/dictionary.rs @@ -8,7 +8,7 @@ use crate::util::hex::HEX_CHARS; /// It also supports binary keys and values which will be minimally escaped but render the result not /// entirely human readable. Keys are serialized in natural sort order so the result can be consistently /// checksummed or hashed. -#[derive(Clone, PartialEq, Eq)] +#[derive(Clone)] pub struct Dictionary(BTreeMap>); fn write_escaped(b: &[u8], w: &mut W) -> std::io::Result<()> { diff --git a/network-hypervisor/src/vl1/fragmentedpacket.rs b/network-hypervisor/src/vl1/fragmentedpacket.rs index 99458f1e3..14a852c46 100644 --- a/network-hypervisor/src/vl1/fragmentedpacket.rs +++ b/network-hypervisor/src/vl1/fragmentedpacket.rs @@ -15,7 +15,6 @@ pub(crate) struct FragmentedPacket { } impl FragmentedPacket { - #[inline(always)] pub fn new(ts: i64) -> Self { Self { ts_ticks: ts, diff --git a/network-hypervisor/src/vl1/mod.rs b/network-hypervisor/src/vl1/mod.rs index 9c7a925f2..3ab6f25ac 100644 --- a/network-hypervisor/src/vl1/mod.rs +++ b/network-hypervisor/src/vl1/mod.rs @@ -16,7 +16,7 @@ pub(crate) mod dictionary; pub(crate) mod address; pub(crate) mod mac; pub(crate) mod fragmentedpacket; -pub(crate) mod whois; +pub(crate) mod whoisqueue; // Export some core objects into the root namespace, since these are what other code will driectly deal with. pub use address::Address; diff --git a/network-hypervisor/src/vl1/node.rs b/network-hypervisor/src/vl1/node.rs index 668d05410..d9fb64c06 100644 --- a/network-hypervisor/src/vl1/node.rs +++ b/network-hypervisor/src/vl1/node.rs @@ -14,7 +14,7 @@ use crate::vl1::buffer::{Buffer, PooledBufferFactory}; use crate::vl1::path::Path; use crate::vl1::peer::Peer; use crate::vl1::protocol::*; -use crate::vl1::whois::{WhoisQueue, QueuedPacket}; +use crate::vl1::whoisqueue::{WhoisQueue, QueuedPacket}; use crate::vl1::rootset::RootSet; /// Standard packet buffer type including pool container. diff --git a/network-hypervisor/src/vl1/whois.rs b/network-hypervisor/src/vl1/whoisqueue.rs similarity index 100% rename from network-hypervisor/src/vl1/whois.rs rename to network-hypervisor/src/vl1/whoisqueue.rs