fixup: actually update to 2024 edition

Author: dignifiedquire

iroh-base/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "iroh-base"
 version = "0.90.0"
-edition = "2021"
+edition = "2024"
 readme = "README.md"
 description = "base type and utilities for Iroh"
 license = "MIT OR Apache-2.0"

iroh-dns-server/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "iroh-dns-server"
 version = "0.90.0"
-edition = "2021"
+edition = "2024"
 description = "A pkarr relay and DNS server"
 license = "MIT OR Apache-2.0"
 authors = ["Frando <franz@n0.computer>", "n0 team"]

iroh-dns-server/benches/write.rs

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

iroh-dns-server/examples/publish.rs

@@ -2,13 +2,13 @@ use std::{net::SocketAddr, str::FromStr};
 
 use clap::{Parser, ValueEnum};
 use iroh::{
+    NodeId, SecretKey,
     discovery::{
-        dns::{N0_DNS_NODE_ORIGIN_PROD, N0_DNS_NODE_ORIGIN_STAGING},
-        pkarr::{PkarrRelayClient, N0_DNS_PKARR_RELAY_PROD, N0_DNS_PKARR_RELAY_STAGING},
         UserData,
+        dns::{N0_DNS_NODE_ORIGIN_PROD, N0_DNS_NODE_ORIGIN_STAGING},
+        pkarr::{N0_DNS_PKARR_RELAY_PROD, N0_DNS_PKARR_RELAY_STAGING, PkarrRelayClient},
     },
-    node_info::{NodeIdExt, NodeInfo, IROH_TXT_NAME},
-    NodeId, SecretKey,
+    node_info::{IROH_TXT_NAME, NodeIdExt, NodeInfo},
 };
 use n0_snafu::{Result, ResultExt};
 use url::Url;

iroh-dns-server/examples/resolve.rs

@@ -1,8 +1,8 @@
 use clap::{Parser, ValueEnum};
 use iroh::{
+    NodeId,
     discovery::dns::{N0_DNS_NODE_ORIGIN_PROD, N0_DNS_NODE_ORIGIN_STAGING},
     dns::DnsResolver,
-    NodeId,
 };
 use n0_snafu::{Result, ResultExt};
 

iroh-dns-server/src/dns.rs

@@ -16,16 +16,16 @@ use hickory_server::{
         self,
         op::ResponseCode,
         rr::{
-            rdata::{self},
             LowerName, Name, RData, Record, RecordSet, RecordType, RrKey,
+            rdata::{self},
         },
         serialize::{binary::BinEncoder, txt::RDataParser},
         xfer::Protocol,
     },
     server::{Request, RequestHandler, ResponseHandler, ResponseInfo},
     store::in_memory::InMemoryAuthority,
 };
-use n0_snafu::{format_err, Result, ResultExt};
+use n0_snafu::{Result, ResultExt, format_err};
 use serde::{Deserialize, Serialize};
 use tokio::{
     net::{TcpListener, UdpSocket},

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

@@ -19,7 +19,7 @@ use tracing::{debug, trace};
 
 use crate::{
     store::ZoneStore,
-    util::{record_set_append_origin, PublicKeyBytes},
+    util::{PublicKeyBytes, record_set_append_origin},
 };
 
 #[derive(derive_more::Debug)]

iroh-dns-server/src/http.rs

@@ -6,13 +6,13 @@ use std::{
 };
 
 use axum::{
+    Router,
     extract::{ConnectInfo, Request, State},
     handler::Handler,
     http::Method,
     middleware::{self, Next},
     response::IntoResponse,
     routing::get,
-    Router,
 };
 use n0_snafu::{Result, ResultExt};
 use serde::{Deserialize, Serialize};
@@ -22,7 +22,7 @@ use tower_http::{
     cors::{self, CorsLayer},
     trace::TraceLayer,
 };
-use tracing::{info, span, warn, Level};
+use tracing::{Level, info, span, warn};
 
 mod doh;
 mod error;

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

@@ -4,17 +4,17 @@
 // https://github.com/fission-codes/fission-server/blob/main/fission-server/src/routes/doh.rs
 
 use axum::{
+    Json,
     extract::State,
     response::{IntoResponse, Response},
-    Json,
 };
 use hickory_server::proto::{
     serialize::binary::BinDecodable,
     {self},
 };
 use http::{
-    header::{CACHE_CONTROL, CONTENT_TYPE},
     HeaderValue, StatusCode,
+    header::{CACHE_CONTROL, CONTENT_TYPE},
 };
 use n0_snafu::ResultExt;
 

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

@@ -25,7 +25,7 @@ use hickory_server::{
     },
     server::Request as DNSRequest,
 };
-use http::{header, request::Parts, HeaderValue, StatusCode};
+use http::{HeaderValue, StatusCode, header, request::Parts};
 use serde::Deserialize;
 use tracing::info;