chore: clippy fix & cargo fix & fmt

Author: Frando

iroh-dns-server/src/config.rs

@@ -7,7 +7,7 @@ use std::{
     time::Duration,
 };
 
-use n0_error::{Result, StackResultExt, StdResultExt};
+use n0_error::{Result, StdResultExt};
 use serde::{Deserialize, Serialize};
 use tracing::info;
 

iroh-dns-server/src/http.rs

@@ -14,7 +14,7 @@ use axum::{
     response::IntoResponse,
     routing::get,
 };
-use n0_error::{Result, StackResultExt, StdResultExt, whatever};
+use n0_error::{Result, StdResultExt, whatever};
 use serde::{Deserialize, Serialize};
 use tokio::{net::TcpListener, task::JoinSet};
 use tower_http::{

iroh-dns-server/src/lib.rs

@@ -43,7 +43,7 @@ mod tests {
     #[tokio::test]
     #[traced_test]
     async fn pkarr_publish_dns_resolve() -> Result {
-        let (server, nameserver, http_url) = Server::spawn_for_tests().await.e()?;
+        let (server, nameserver, http_url) = Server::spawn_for_tests().await?;
         let pkarr_relay_url = {
             let mut url = http_url.clone();
             url.set_path("/pkarr");
@@ -158,7 +158,7 @@ mod tests {
     #[tokio::test]
     #[traced_test]
     async fn integration_smoke() -> Result {
-        let (server, nameserver, http_url) = Server::spawn_for_tests().await.e()?;
+        let (server, nameserver, http_url) = Server::spawn_for_tests().await?;
 
         let pkarr_relay = {
             let mut url = http_url.clone();
@@ -213,7 +213,7 @@ mod tests {
 
         tokio::time::sleep(Duration::from_secs(1)).await;
         for _ in 0..10 {
-            let entry = store.get_signed_packet(&key).await.e()?;
+            let entry = store.get_signed_packet(&key).await?;
             if entry.is_none() {
                 return Ok(());
             }
@@ -264,7 +264,7 @@ mod tests {
         assert_eq!(res.endpoint_id, endpoint_id);
         assert_eq!(res.relay_url(), Some(&relay_url));
 
-        server.shutdown().await.e()?;
+        server.shutdown().await?;
         Ok(())
     }
 

iroh/examples/0rtt.rs

@@ -166,7 +166,7 @@ async fn accept(_args: Args) -> Result<()> {
                 send.write_all(&data).await.e()?;
                 send.finish().e()?;
                 connection.closed().await;
-                Ok::<_, n0_error::Error>(())
+                Ok::<_, n0_error::AnyError>(())
             });
         }
     };

iroh/examples/dht_discovery.rs

@@ -100,7 +100,7 @@ async fn chat_server(args: Args) -> Result<()> {
                 tokio::spawn(
                     async move { tokio::io::copy(&mut tokio::io::stdin(), &mut writer).await },
                 );
-            Ok::<_, n0_error::Error>(())
+            Ok::<_, n0_error::AnyError>(())
         });
     }
     Ok(())

iroh/examples/listen.rs

@@ -105,7 +105,7 @@ async fn main() -> Result<()> {
             if res.is_err() {
                 println!("endpoint {endpoint_id} did not disconnect within 3 seconds");
             }
-            Ok::<_, n0_error::Error>(())
+            Ok::<_, n0_error::AnyError>(())
         });
     }
     // stop with SIGINT (ctrl-c)

iroh/examples/locally-discovered-nodes.rs

@@ -73,7 +73,7 @@ async fn main() -> Result<()> {
             ep.set_user_data_for_discovery(Some(ud));
             tokio::time::sleep(Duration::from_secs(3)).await;
             ep.close().await;
-            Ok::<_, n0_error::Error>(())
+            Ok::<_, n0_error::AnyError>(())
         });
     }
 

iroh/examples/screening-connection.rs

@@ -110,7 +110,9 @@ impl ProtocolHandler for ScreenedEcho {
         // reject every other connection
         if count % 2 == 0 {
             println!("rejecting connection");
-            return Err(AcceptError::NotAllowed {});
+            return Err(AcceptError::NotAllowed {
+                meta: n0_error::Meta::new(),
+            });
         }
 
         // To allow normal connection construction, await the connecting future & return

iroh/examples/transfer.rs

@@ -246,7 +246,7 @@ impl EndpointArgs {
         if let Some(host) = self.dns_server {
             let addr = tokio::net::lookup_host(host)
                 .await
-                .context("Failed to resolve DNS server address")?
+                .std_context("Failed to resolve DNS server address")?
                 .next()
                 .context("Failed to resolve DNS server address")?;
             builder = builder.dns_resolver(DnsResolver::with_nameserver(addr));
@@ -379,7 +379,7 @@ async fn provide(endpoint: Endpoint, size: u64) -> Result<()> {
             } else {
                 println!("[{remote}] Disconnected");
             }
-            Ok::<_, n0_error::Error>(())
+            Ok::<_, n0_error::AnyError>(())
         });
     }
 
@@ -493,21 +493,21 @@ async fn send_data_on_stream(
         stream
             .write_chunk(bytes_data.clone())
             .await
-            .context("failed sending data")?;
+            .std_context("failed sending data")?;
     }
 
     if remaining != 0 {
         stream
             .write_chunk(bytes_data.slice(0..remaining))
             .await
-            .context("failed sending data")?;
+            .std_context("failed sending data")?;
     }
 
-    stream.finish().context("failed finishing stream")?;
+    stream.finish().std_context("failed finishing stream")?;
     stream
         .stopped()
         .await
-        .context("failed to wait for stream to be stopped")?;
+        .std_context("failed to wait for stream to be stopped")?;
 
     Ok(())
 }