fmt

Author: divagant-martian

iroh-base/src/node_addr.rs

@@ -11,7 +11,6 @@ use std::{collections::BTreeSet, net::SocketAddr};
 use serde::{Deserialize, Serialize};
 
 use crate::key::{NodeId, PublicKey};
-
 pub use crate::relay_url::RelayUrl;
 
 /// Network-level addressing information for an iroh-net node.

iroh-base/src/relay_map.rs

@@ -2,10 +2,11 @@
 
 use std::{collections::BTreeMap, fmt, sync::Arc};
 
-pub use crate::relay_url::RelayUrl;
 use anyhow::{ensure, Result};
 use serde::{Deserialize, Serialize};
 
+pub use crate::relay_url::RelayUrl;
+
 /// The default STUN port used by the Relay server.
 ///
 /// The STUN port as defined by [RFC 8489](<https://www.rfc-editor.org/rfc/rfc8489#section-18.6>)

iroh-net/src/lib.rs

@@ -247,8 +247,11 @@ pub mod tls;
 pub(crate) mod util;
 
 pub use endpoint::{AddrInfo, Endpoint, NodeAddr, RelayMode};
-pub use iroh_base::relay_map::{RelayMap, RelayNode, RelayUrl};
-pub use iroh_base::{key, key::NodeId};
+pub use iroh_base::{
+    key,
+    key::NodeId,
+    relay_map::{RelayMap, RelayNode, RelayUrl},
+};
 pub use iroh_relay as relay;
 
 #[cfg(any(test, feature = "test-utils"))]

iroh-net/src/metrics.rs

@@ -2,7 +2,7 @@
 #[cfg(feature = "test-utils")]
 #[cfg_attr(iroh_docsrs, doc(cfg(feature = "test-utils")))]
 pub use iroh_relay::server::Metrics as RelayMetrics;
+pub use netcheck::Metrics as NetcheckMetrics;
 pub use portmapper::Metrics as PortmapMetrics;
 
 pub use crate::magicsock::Metrics as MagicsockMetrics;
-pub use netcheck::Metrics as NetcheckMetrics;

iroh-netcheck/src/dns.rs

@@ -1,5 +1,4 @@
-use std::fmt::Write;
-use std::net::IpAddr;
+use std::{fmt::Write, net::IpAddr};
 
 use anyhow::Result;
 use futures_lite::{Future, StreamExt};
@@ -201,8 +200,7 @@ async fn stagger_call<T, F: Fn() -> Fut, Fut: Future<Output = Result<T>>>(
 
 #[cfg(test)]
 pub(crate) mod tests {
-    use std::net::Ipv6Addr;
-    use std::sync::atomic::AtomicUsize;
+    use std::{net::Ipv6Addr, sync::atomic::AtomicUsize};
 
     use once_cell::sync::Lazy;
 

iroh-netcheck/src/lib.rs

@@ -16,6 +16,7 @@ use std::{
 use anyhow::{anyhow, Context as _, Result};
 use bytes::Bytes;
 use hickory_resolver::TokioAsyncResolver as DnsResolver;
+use iroh_base::relay_map::{RelayMap, RelayNode, RelayUrl};
 use iroh_metrics::inc;
 use iroh_relay::protos::stun;
 use netwatch::{IpFamily, UdpSocket};
@@ -26,8 +27,6 @@ use tokio::{
 use tokio_util::{sync::CancellationToken, task::AbortOnDropHandle};
 use tracing::{debug, error, info_span, trace, warn, Instrument};
 
-use iroh_base::relay_map::{RelayMap, RelayNode, RelayUrl};
-
 pub mod defaults;
 mod dns;
 mod metrics;

iroh-netcheck/src/reportgen.rs

@@ -26,6 +26,7 @@ use std::{
 };
 
 use anyhow::{anyhow, bail, Context as _, Result};
+use hickory_resolver::TokioAsyncResolver as DnsResolver;
 use iroh_metrics::inc;
 use iroh_relay::{http::RELAY_PROBE_PATH, protos::stun};
 use netwatch::{interfaces, UdpSocket};
@@ -47,7 +48,6 @@ use crate::{
     ping::{PingError, Pinger},
     RelayMap, RelayNode, RelayUrl, Report,
 };
-use hickory_resolver::TokioAsyncResolver as DnsResolver;
 
 mod hairpin;
 mod probes;

iroh-netcheck/src/reportgen/hairpin.rs

@@ -21,8 +21,7 @@ use tokio::{sync::oneshot, time::Instant};
 use tokio_util::task::AbortOnDropHandle;
 use tracing::{debug, error, info_span, trace, warn, Instrument};
 
-use crate::defaults::timeouts::HAIRPIN_CHECK_TIMEOUT;
-use crate::{self as netcheck, reportgen, Inflight};
+use crate::{self as netcheck, defaults::timeouts::HAIRPIN_CHECK_TIMEOUT, reportgen, Inflight};
 
 /// Handle to the hairpin actor.
 ///