diff --git a/ubw-sward/src/http/integrated.rs b/ubw-sward/src/http/integrated.rs index 22d6977..1d79e6e 100644 --- a/ubw-sward/src/http/integrated.rs +++ b/ubw-sward/src/http/integrated.rs @@ -1,4 +1,4 @@ -use crate::http::counter::{AtomicHttpCounter, HttpCounter}; +use crate::http::counter::AtomicHttpCounter; use crate::http::header_config::HeadersConfig; use crate::http::simple::HttpSwardArray; use crate::http::{RandomUrlGenerator, SimpleHttpRequest, SimpleHttpSward}; @@ -166,7 +166,7 @@ impl IntegratedHttpSwardBuilder { // get the cookie let maybe_cookie = self .headers_config - .get_cookie_jar(&url_example) + .get_cookie_jar(url_example) .map(Arc::new); // build the clients diff --git a/ubw-sward/src/http/mod.rs b/ubw-sward/src/http/mod.rs index b2d8746..54c6b31 100644 --- a/ubw-sward/src/http/mod.rs +++ b/ubw-sward/src/http/mod.rs @@ -1,9 +1,9 @@ +pub mod counter; +pub mod header_config; +pub mod integrated; pub mod random; pub mod simple; -pub mod integrated; -pub mod header_config; -pub mod counter; +pub use integrated::IntegratedHttpSward; pub use random::RandomUrlGenerator; pub use simple::{SimpleHttpRequest, SimpleHttpSward}; -pub use integrated::IntegratedHttpSward; \ No newline at end of file diff --git a/ubw-sward/src/lib.rs b/ubw-sward/src/lib.rs index daaec9c..4aef5f5 100644 --- a/ubw-sward/src/lib.rs +++ b/ubw-sward/src/lib.rs @@ -3,6 +3,6 @@ #![deny(clippy::expect_used)] pub mod http; -pub mod utils; pub mod tcp; -pub mod udp; \ No newline at end of file +pub mod udp; +pub mod utils; diff --git a/ubw-sward/src/tcp/ack.rs b/ubw-sward/src/tcp/ack.rs index e69de29..8b13789 100644 --- a/ubw-sward/src/tcp/ack.rs +++ b/ubw-sward/src/tcp/ack.rs @@ -0,0 +1 @@ + diff --git a/ubw-sward/src/tcp/mod.rs b/ubw-sward/src/tcp/mod.rs index d455196..5903612 100644 --- a/ubw-sward/src/tcp/mod.rs +++ b/ubw-sward/src/tcp/mod.rs @@ -1,2 +1,2 @@ pub mod ack; -pub mod syn; \ No newline at end of file +pub mod syn; diff --git a/ubw-sward/src/tcp/syn.rs b/ubw-sward/src/tcp/syn.rs index e69de29..8b13789 100644 --- a/ubw-sward/src/tcp/syn.rs +++ b/ubw-sward/src/tcp/syn.rs @@ -0,0 +1 @@ + diff --git a/ubw-sward/src/udp/generator.rs b/ubw-sward/src/udp/generator.rs index 2d1d101..ef77089 100644 --- a/ubw-sward/src/udp/generator.rs +++ b/ubw-sward/src/udp/generator.rs @@ -1,5 +1,5 @@ -use rand::RngCore; use crate::udp::{BoxedUdpRequest, SizedUdpRequest}; +use rand::RngCore; pub struct RandomUdpWorkloadGenerator { rng: Rng, @@ -12,13 +12,11 @@ impl RandomUdpWorkloadGenerator { pub fn generate_sized(&mut self) -> SizedUdpRequest { let mut buf = [0u8; SIZE]; self.rng.fill_bytes(&mut buf); - SizedUdpRequest { - bytes: buf - } + SizedUdpRequest { bytes: buf } } pub fn generate_boxed(&mut self, size: usize) -> BoxedUdpRequest { let mut buf = vec![0u8; size].into_boxed_slice(); self.rng.fill_bytes(&mut buf); BoxedUdpRequest(buf) } -} \ No newline at end of file +} diff --git a/ubw-sward/src/udp/mod.rs b/ubw-sward/src/udp/mod.rs index 5fccf93..b278e26 100644 --- a/ubw-sward/src/udp/mod.rs +++ b/ubw-sward/src/udp/mod.rs @@ -1,7 +1,7 @@ +mod counter; pub mod generator; pub mod integrated; pub mod random_flood; -mod counter; pub use generator::RandomUdpWorkloadGenerator; pub use integrated::IntegratedUdpSward; diff --git a/ubw-sward/src/udp/random_flood.rs b/ubw-sward/src/udp/random_flood.rs index 3989dfd..370dfbd 100644 --- a/ubw-sward/src/udp/random_flood.rs +++ b/ubw-sward/src/udp/random_flood.rs @@ -36,9 +36,7 @@ impl Service> for UdpSward { fn call(&mut self, req: SizedUdpRequest) -> Self::Future { self.sent_count += 1; let socket = self.socket.clone(); - Box::pin(async move { - socket.send(&req.bytes).await - }) + Box::pin(async move { socket.send(&req.bytes).await }) } } @@ -55,9 +53,7 @@ impl Service for UdpSward { fn call(&mut self, req: BoxedUdpRequest) -> Self::Future { self.sent_count += 1; let socket = self.socket.clone(); - Box::pin(async move { - socket.send(&req.0).await - }) + Box::pin(async move { socket.send(&req.0).await }) } } @@ -66,4 +62,4 @@ impl tower::load::Load for UdpSward { fn load(&self) -> Self::Metric { self.sent_count } -} \ No newline at end of file +}