From 29f97e881ecf6d819e0d3045fd1281210a65fdb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= <joakim.frostegard@gmail.com>
Date: Sat, 16 Apr 2022 00:43:23 +0200
Subject: [PATCH] udp: improve formatting of imports

---
 aquatic_udp/src/workers/request/mod.rs     |  5 +----
 aquatic_udp/src/workers/request/storage.rs |  8 ++++----
 aquatic_udp/src/workers/socket/mod.rs      | 18 +++++++++---------
 aquatic_udp/src/workers/socket/requests.rs |  4 +---
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/aquatic_udp/src/workers/request/mod.rs b/aquatic_udp/src/workers/request/mod.rs
index 6c06d69..b45b8be 100644
--- a/aquatic_udp/src/workers/request/mod.rs
+++ b/aquatic_udp/src/workers/request/mod.rs
@@ -6,13 +6,10 @@ use std::sync::atomic::Ordering;
 use std::time::Duration;
 use std::time::Instant;
 
-use aquatic_common::CanonicalSocketAddr;
-use aquatic_common::PanicSentinel;
-use aquatic_common::ValidUntil;
 use crossbeam_channel::Receiver;
 use rand::{rngs::SmallRng, SeedableRng};
 
-use aquatic_common::extract_response_peers;
+use aquatic_common::{extract_response_peers, CanonicalSocketAddr, PanicSentinel, ValidUntil};
 
 use aquatic_udp_protocol::*;
 
diff --git a/aquatic_udp/src/workers/request/storage.rs b/aquatic_udp/src/workers/request/storage.rs
index e558ad7..05052ba 100644
--- a/aquatic_udp/src/workers/request/storage.rs
+++ b/aquatic_udp/src/workers/request/storage.rs
@@ -3,10 +3,10 @@ use std::net::Ipv6Addr;
 use std::sync::Arc;
 use std::time::Instant;
 
-use aquatic_common::access_list::create_access_list_cache;
-use aquatic_common::access_list::AccessListArcSwap;
-use aquatic_common::AmortizedIndexMap;
-use aquatic_common::ValidUntil;
+use aquatic_common::{
+    access_list::{create_access_list_cache, AccessListArcSwap},
+    AmortizedIndexMap, ValidUntil,
+};
 
 use aquatic_udp_protocol::*;
 
diff --git a/aquatic_udp/src/workers/socket/mod.rs b/aquatic_udp/src/workers/socket/mod.rs
index cf8290d..d53d8b4 100644
--- a/aquatic_udp/src/workers/socket/mod.rs
+++ b/aquatic_udp/src/workers/socket/mod.rs
@@ -5,23 +5,23 @@ mod storage;
 use std::time::{Duration, Instant};
 
 use anyhow::Context;
-use aquatic_common::privileges::PrivilegeDropper;
 use crossbeam_channel::Receiver;
 use mio::net::UdpSocket;
 use mio::{Events, Interest, Poll, Token};
-
-use aquatic_common::access_list::create_access_list_cache;
-use aquatic_common::CanonicalSocketAddr;
-use aquatic_common::{PanicSentinel, ValidUntil};
-use aquatic_udp_protocol::*;
 use socket2::{Domain, Protocol, Socket, Type};
 
+use aquatic_common::{
+    access_list::create_access_list_cache, privileges::PrivilegeDropper, CanonicalSocketAddr,
+    PanicSentinel, ValidUntil,
+};
+use aquatic_udp_protocol::*;
+
 use crate::common::*;
 use crate::config::Config;
 
-use self::requests::read_requests;
-use self::responses::send_responses;
-use self::storage::PendingScrapeResponseSlab;
+use requests::read_requests;
+use responses::send_responses;
+use storage::PendingScrapeResponseSlab;
 
 pub fn run_socket_worker(
     _sentinel: PanicSentinel,
diff --git a/aquatic_udp/src/workers/socket/requests.rs b/aquatic_udp/src/workers/socket/requests.rs
index cc71eab..610f0ae 100644
--- a/aquatic_udp/src/workers/socket/requests.rs
+++ b/aquatic_udp/src/workers/socket/requests.rs
@@ -3,9 +3,7 @@ use std::sync::atomic::Ordering;
 
 use mio::net::UdpSocket;
 
-use aquatic_common::access_list::AccessListCache;
-use aquatic_common::CanonicalSocketAddr;
-use aquatic_common::ValidUntil;
+use aquatic_common::{access_list::AccessListCache, CanonicalSocketAddr, ValidUntil};
 use aquatic_udp_protocol::*;
 
 use crate::common::*;