chore(iroh,iroh-relay): Bump iroh-metrics version to 0.35, bump portmapper to 0.6.1

iroh-dns-server/Cargo.toml

@@ -29,7 +29,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.12.3"
 n0-future = "0.1.2"
 pkarr = { version = "3.7", features = ["relays", "dht"], default-features = false }

iroh-relay/Cargo.toml

@@ -33,7 +33,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/src/client/tls.rs

@@ -127,7 +127,7 @@ impl MaybeTlsStreamBuilder {
         }
     }
 
-    fn tls_servername(&self) -> Option<rustls::pki_types::ServerName> {
+    fn tls_servername(&self) -> Option<rustls::pki_types::ServerName<'_>> {
         self.url
             .host_str()
             .and_then(|s| rustls::pki_types::ServerName::try_from(s).ok())

iroh/Cargo.toml

@@ -86,7 +86,7 @@ futures-buffered = "0.2.11"
 spki = { version = "0.7.3", features = ["std"] }
 
 # metrics
-iroh-metrics = { version = "0.34", default-features = false }
+iroh-metrics = { version = "0.35", default-features = false }
 
 # local-swarm-discovery
 swarm-discovery = { version = "0.3.1", optional = true }
@@ -108,7 +108,7 @@ parse-size = { version = "=1.0.0", optional = true } # pinned version to avoid b
 hickory-resolver = "0.25.1"
 igd-next = { version = "0.16", features = ["aio_tokio"] }
 netdev = { version = "0.31.0" }
-portmapper = { version = "0.5.0", default-features = false }
+portmapper = { version = "0.6.1", default-features = false }
 quinn = { package = "iroh-quinn", version = "0.13.0", default-features = false, features = ["runtime-tokio", "rustls-ring"] }
 tokio = { version = "1", features = [
     "io-util",

iroh/bench/Cargo.toml

@@ -10,7 +10,7 @@ anyhow = "1.0.22"
 bytes = "1.7"
 hdrhistogram = { version = "7.2", default-features = false }
 iroh = { path = ".." }
-iroh-metrics = "0.34"
+iroh-metrics = "0.35"
 n0-future = "0.1.1"
 quinn = { package = "iroh-quinn", version = "0.13" }
 rand = "0.8"

iroh/src/magicsock/node_map/best_addr.rs

@@ -180,7 +180,7 @@ impl BestAddr {
         self.0 = Some(inner);
     }
 
-    pub fn state(&self, now: Instant) -> State {
+    pub fn state(&self, now: Instant) -> State<'_> {
         match &self.0 {
             None => State::Empty,
             Some(state) => match state.trust_until {

iroh/src/tls/certificate.rs

@@ -121,7 +121,7 @@ pub(crate) struct VerificationError(#[from] pub(crate) webpki::Error);
 /// Internal function that only parses but does not verify the certificate.
 ///
 /// Useful for testing but unsuitable for production.
-fn parse_unverified(der_input: &[u8]) -> Result<P2pCertificate, webpki::Error> {
+fn parse_unverified(der_input: &[u8]) -> Result<P2pCertificate<'_>, webpki::Error> {
     let x509 = X509Certificate::from_der(der_input)
         .map(|(_rest_input, x509)| x509)
         .map_err(|_| webpki::Error::BadDer)?;

iroh/src/watchable.rs

@@ -131,7 +131,7 @@ impl<T: Clone + Eq> Watcher<T> {
     /// # Cancel Safety
     ///
     /// The returned future is cancel-safe.
-    pub fn updated(&mut self) -> WatchNextFut<T> {
+    pub fn updated(&mut self) -> WatchNextFut<'_, T> {
         WatchNextFut { watcher: self }
     }
 
@@ -180,7 +180,7 @@ impl<T: Clone + Eq> Watcher<Option<T>> {
     ///
     /// This is a utility for the common case of storing an [`Option`] inside a
     /// [`Watchable`].
-    pub fn initialized(&mut self) -> WatchInitializedFut<T> {
+    pub fn initialized(&mut self) -> WatchInitializedFut<'_, T> {
         self.epoch = PRE_INITIAL_EPOCH;
         WatchInitializedFut { watcher: self }
     }