chore(*): upgrade to the latest iroh-metrics, portmapper, and swarm-discovery (#3369)

## Description

Upgrade to the latest `iroh-metrics`, `portmapper`, and
`swarm-discovery`.

We can finally remove our `anyhow` direct dependency!

Lots of clippy changes because of a clippy update.

## Change checklist
<!-- Remove any that are not relevant. -->
- [x] Self-review.

Author: ramfox

Cargo.lock

@@ -28,7 +28,7 @@ hickory-server = { version = "0.25.1", features = ["https-ring"] }
 http = "1.0.0"
 humantime = "2.2.0"
 humantime-serde = "1.1.1"
-iroh-metrics = { version = "0.34", features = ["service"] }
+iroh-metrics = { version = "0.35", features = ["service"] }
 lru = "0.13"
 n0-future = "0.1.2"
 n0-snafu = "0.2.0"

iroh-dns-server/Cargo.toml

@@ -27,7 +27,7 @@ fn main() -> Result<()> {
         Command::PkarrToNode { z32_pubkey } => {
             let public_key = pkarr::PublicKey::try_from(z32_pubkey.as_str()).e()?;
             let node_id = NodeId::from_bytes(public_key.as_bytes()).e()?;
-            println!("{}", node_id)
+            println!("{node_id}")
         }
     }
     Ok(())

iroh-dns-server/examples/convert.rs

@@ -116,30 +116,21 @@ async fn main() -> Result<()> {
 
     match args.env {
         Env::Staging => {
-            println!(
-                "   cargo run --example resolve -- --env staging node {}",
-                node_id
-            );
+            println!("   cargo run --example resolve -- --env staging node {node_id}");
             println!(
                 "   dig {} TXT",
                 fmt_domain(&node_id, N0_DNS_NODE_ORIGIN_STAGING)
             )
         }
         Env::Prod => {
-            println!(
-                "   cargo run --example resolve -- --env prod node {}",
-                node_id
-            );
+            println!("   cargo run --example resolve -- --env prod node {node_id}");
             println!(
                 "   dig {} TXT",
                 fmt_domain(&node_id, N0_DNS_NODE_ORIGIN_PROD)
             )
         }
         Env::Dev => {
-            println!(
-                "    cargo run --example resolve -- --env dev node {}",
-                node_id
-            );
+            println!("    cargo run --example resolve -- --env dev node {node_id}");
             println!(
                 "    dig @localhost -p 5300 {} TXT",
                 fmt_domain(&node_id, DEV_DNS_ORIGIN_DOMAIN)
@@ -150,5 +141,5 @@ async fn main() -> Result<()> {
 }
 
 fn fmt_domain(node_id: &NodeId, origin: &str) -> String {
-    format!("{}.{}.{}", IROH_TXT_NAME, node_id.to_z32(), origin)
+    format!("{IROH_TXT_NAME}.{}.{origin}", node_id.to_z32())
 }

iroh-dns-server/examples/publish.rs

@@ -270,7 +270,7 @@ fn create_static_authority(
     }
 
     let static_authority = InMemoryAuthority::new(Name::root(), records, ZoneType::Primary, false)
-        .map_err(|e| format_err!("new authority: {}", e))?;
+        .map_err(|e| format_err!("new authority: {e}"))?;
 
     Ok((static_authority, serial))
 }

iroh-dns-server/src/dns.rs

@@ -257,7 +257,7 @@ fn decode_request(bytes: &[u8], src_addr: SocketAddr) -> Result<DNSRequest, AppE
         }
         Err(err) => Err(AppError::new(
             StatusCode::BAD_REQUEST,
-            Some(format!("Invalid DNS message: {}", err)),
+            Some(format!("Invalid DNS message: {err}")),
         )),
     }
 }

iroh-dns-server/src/http/doh/extract.rs

@@ -32,7 +32,7 @@ http-body-util = "0.1.0"
 hyper = { version = "1", features = ["server", "client", "http1"] }
 hyper-util = "0.1.1"
 iroh-base = { version = "0.35.0", path = "../iroh-base", default-features = false, features = ["key", "relay"] }
-iroh-metrics = { version = "0.34", default-features = false }
+iroh-metrics = { version = "0.35", default-features = false }
 n0-future = "0.1.2"
 num_enum = "0.7"
 pin-project = "1"

iroh-relay/Cargo.toml

@@ -228,7 +228,7 @@ impl MaybeTlsStreamBuilder {
 
         // Establish Proxy Tunnel
         let mut req_builder = Request::builder()
-            .uri(format!("{}:{}", target_host, port))
+            .uri(format!("{target_host}:{port}"))
             .method("CONNECT")
             .header("Host", target_host)
             .header("Proxy-Connection", "Keep-Alive");
@@ -245,7 +245,7 @@ impl MaybeTlsStreamBuilder {
                 proxy_url.password().unwrap_or_default()
             );
             let encoded = BASE64URL.encode(to_encode.as_bytes());
-            req_builder = req_builder.header("Proxy-Authorization", format!("Basic {}", encoded));
+            req_builder = req_builder.header("Proxy-Authorization", format!("Basic {encoded}"));
         }
         let req = req_builder
             .body(Empty::<Bytes>::new())

iroh-relay/src/client/tls.rs

@@ -586,7 +586,7 @@ async fn maybe_load_tls(
                 .clone()
                 .context("LetsEncrypt needs a contact email")?;
             let config = AcmeConfig::new(vec![hostname.clone()])
-                .contact([format!("mailto:{}", contact)])
+                .contact([format!("mailto:{contact}")])
                 .cache_option(Some(DirCache::new(tls.cert_dir())))
                 .directory_lets_encrypt(tls.prod_tls);
             let state = config.state();

iroh-relay/src/main.rs

@@ -730,7 +730,7 @@ fn ensure_iroh_txt_label(name: Name) -> Result<Name, LookupError> {
 
 #[cfg(not(wasm_browser))]
 fn node_domain(node_id: &NodeId, origin: &str) -> Result<Name, LookupError> {
-    let domain = format!("{}.{}", NodeId::to_z32(node_id), origin);
+    let domain = format!("{}.{origin}", NodeId::to_z32(node_id));
     let domain = Name::from_str(&domain).context(InvalidLabelSnafu)?;
     Ok(domain)
 }