codex did it

Author: Frando

Cargo.lock

@@ -31,7 +31,6 @@ humantime-serde = "1.1.1"
 iroh-metrics = { version = "0.36", features = ["service"] }
 lru = "0.16"
 n0-future = "0.3.0"
-n0-snafu = "0.2.2"
 pkarr = { version = "5", features = ["relays", "dht"], default-features = false }
 rcgen = "0.14"
 redb = "2.6.3"
@@ -40,7 +39,7 @@ rustls = { version = "0.23.33", default-features = false, features = ["ring"] }
 rustls-pemfile = { version = "2.1" }
 serde = { version = "1", features = ["derive"] }
 struct_iterable = "0.1.1"
-snafu = { version = "0.8.5", features = ["rust_1_81"] }
+n0-error = { git = "https://github.com/n0-computer/n0-error" }
 strum = { version = "0.27", features = ["derive"] }
 tokio = { version = "1", features = ["full"] }
 tokio-rustls = { version = "0.26", default-features = false, features = [
@@ -64,7 +63,6 @@ criterion = "0.7.0"
 data-encoding = "2.3.3"
 hickory-resolver = "0.25.0"
 iroh = { path = "../iroh" }
-n0-error = { git = "https://github.com/n0-computer/n0-error" }
 rand = "0.9.2"
 rand_chacha = "0.9"
 tracing-test = "0.2.5"

iroh-dns-server/Cargo.toml

@@ -3,7 +3,7 @@ use std::sync::Arc;
 use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main};
 use iroh::{SecretKey, discovery::pkarr::PkarrRelayClient, endpoint_info::EndpointInfo};
 use iroh_dns_server::{ZoneStore, config::Config, metrics::Metrics, server::Server};
-use n0_snafu::Result;
+use n0_error::Result;
 use rand_chacha::rand_core::SeedableRng;
 use tokio::runtime::Runtime;
 

iroh-dns-server/benches/write.rs

@@ -2,7 +2,7 @@ use std::str::FromStr;
 
 use clap::Parser;
 use iroh::EndpointId;
-use n0_snafu::{Result, ResultExt};
+use n0_error::{Result, StdResultExt};
 
 #[derive(Debug, Parser)]
 struct Cli {
@@ -26,7 +26,7 @@ fn main() -> Result<()> {
         }
         Command::PkarrToEndpoint { z32_pubkey } => {
             let public_key = pkarr::PublicKey::try_from(z32_pubkey.as_str()).e()?;
-            let endpoint_id = EndpointId::from_bytes(public_key.as_bytes()).e()?;
+            let endpoint_id = EndpointId::from_bytes(public_key.as_bytes())?;
             println!("{endpoint_id}")
         }
     }

iroh-dns-server/examples/convert.rs

@@ -10,7 +10,7 @@ use iroh::{
     },
     endpoint_info::{EndpointIdExt, EndpointInfo, IROH_TXT_NAME},
 };
-use n0_snafu::{Result, ResultExt};
+use n0_error::{Result, StdResultExt};
 use url::Url;
 
 const DEV_PKARR_RELAY_URL: &str = "http://localhost:8080/pkarr";
@@ -61,7 +61,7 @@ async fn main() -> Result<()> {
 
     let secret_key = match std::env::var("IROH_SECRET") {
         Ok(s) => SecretKey::from_str(&s)
-            .context("failed to parse IROH_SECRET environment variable as iroh secret key")?,
+            .std_context("failed to parse IROH_SECRET environment variable as iroh secret key")?,
         Err(_) => {
             let s = SecretKey::generate(&mut rand::rng());
             println!("Generated a new endpoint secret. To reuse, set");

iroh-dns-server/examples/publish.rs

@@ -4,7 +4,7 @@ use iroh::{
     discovery::dns::{N0_DNS_ENDPOINT_ORIGIN_PROD, N0_DNS_ENDPOINT_ORIGIN_STAGING},
     dns::DnsResolver,
 };
-use n0_snafu::{Result, ResultExt};
+use n0_error::{Result, StdResultExt, format_err};
 
 const DEV_DNS_SERVER: &str = "127.0.0.1:5300";
 const DEV_DNS_ORIGIN_DOMAIN: &str = "irohdns.example";
@@ -51,7 +51,7 @@ async fn main() -> Result<()> {
             .await
             .e()?
             .next()
-            .context("failed to resolve DNS server address")?;
+            .ok_or_else(|| format_err!("failed to resolve DNS server address"))?;
         DnsResolver::with_nameserver(addr)
     } else {
         match args.env {

iroh-dns-server/examples/resolve.rs

@@ -7,7 +7,7 @@ use std::{
     time::Duration,
 };
 
-use n0_snafu::{Result, ResultExt};
+use n0_error::{Result, StackResultExt, StdResultExt};
 use serde::{Deserialize, Serialize};
 use tracing::info;
 
@@ -162,7 +162,10 @@ impl Config {
         );
         let s = tokio::fs::read_to_string(path.as_ref())
             .await
-            .with_context(|| format!("failed to read {}", path.as_ref().to_string_lossy()))?;
+            .std_context(format!(
+                "failed to read {}",
+                path.as_ref().to_string_lossy()
+            ))?;
         let config: Config = toml::from_str(&s).e()?;
         Ok(config)
     }
@@ -172,8 +175,9 @@ impl Config {
         let dir = if let Some(val) = env::var_os("IROH_DNS_DATA_DIR") {
             PathBuf::from(val)
         } else {
-            let path = dirs_next::data_dir()
-                .context("operating environment provides no directory for application data")?;
+            let path = dirs_next::data_dir().std_context(
+                "operating environment provides no directory for application data",
+            )?;
 
             path.join("iroh-dns")
         };

iroh-dns-server/src/config.rs

@@ -25,7 +25,7 @@ use hickory_server::{
     server::{Request, RequestHandler, ResponseHandler, ResponseInfo},
     store::in_memory::InMemoryAuthority,
 };
-use n0_snafu::{Result, ResultExt, format_err};
+use n0_error::{Result, StdResultExt, format_err};
 use serde::{Deserialize, Serialize};
 use tokio::{
     net::{TcpListener, UdpSocket},

iroh-dns-server/src/dns.rs

@@ -13,8 +13,7 @@ use hickory_server::{
     server::RequestInfo,
     store::in_memory::InMemoryAuthority,
 };
-use n0_snafu::{Result, ResultExt};
-use snafu::whatever;
+use n0_error::{Result, StackResultExt, StdResultExt, whatever};
 use tracing::{debug, trace};
 
 use crate::{
@@ -191,8 +190,8 @@ fn parse_name_as_pkarr_with_origin(
         let mut labels_without_origin = labels.skip(origin.num_labels() as usize);
         let pkey_label = labels_without_origin.next().expect("length checked above");
         let pkey_str = std::str::from_utf8(pkey_label).e()?;
-        let pkey =
-            PublicKeyBytes::from_z32(pkey_str).context("not a valid pkarr name: invalid pubkey")?;
+        let pkey = PublicKeyBytes::from_z32(pkey_str)
+            .std_context("not a valid pkarr name: invalid pubkey")?;
         let remaining_name = Name::from_labels(labels_without_origin.rev()).e()?;
         return Ok((remaining_name, pkey, origin.clone()));
     }

iroh-dns-server/src/dns/node_authority.rs

@@ -14,9 +14,8 @@ use axum::{
     response::IntoResponse,
     routing::get,
 };
-use n0_snafu::{Result, ResultExt};
+use n0_error::{Result, StackResultExt, StdResultExt, whatever};
 use serde::{Deserialize, Serialize};
-use snafu::whatever;
 use tokio::{net::TcpListener, task::JoinSet};
 use tower_http::{
     cors::{self, CorsLayer},
@@ -112,9 +111,9 @@ impl HttpServer {
                     .join(config.cert_mode.to_string());
                 tokio::fs::create_dir_all(&cache_path)
                     .await
-                    .with_context(|| {
-                        format!("failed to create cert cache dir at {cache_path:?}")
-                    })?;
+                    .std_context(format!(
+                        "failed to create cert cache dir at {cache_path:?}"
+                    ))?;
                 config
                     .cert_mode
                     .build(
@@ -173,11 +172,11 @@ impl HttpServer {
                 Err(err) if err.is_cancelled() => {}
                 Ok(Err(err)) => {
                     warn!(?err, "task failed");
-                    final_res = Err(err).context("task");
+                    final_res = Err(err).std_context("task");
                 }
                 Err(err) => {
                     warn!(?err, "task panicked");
-                    final_res = Err(err).context("join");
+                    final_res = Err(err).std_context("join");
                 }
             }
         }