chore: upgrade examples to Rust 2024

browser-chat/browser-wasm/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "chat-browser"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

browser-chat/cli/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "chat-cli"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 anyhow = "1.0.95"

browser-chat/shared/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "chat-shared"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 anyhow = "1"

browser-echo/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "browser-echo"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 default-run = "cli"
 
 [lib]

browser-echo/src/node.rs

@@ -1,11 +1,11 @@
 use anyhow::Result;
 use async_channel::Sender;
 use iroh::{
+    Endpoint, NodeId,
     endpoint::Connection,
     protocol::{AcceptError, ProtocolHandler, Router},
-    Endpoint, NodeId,
 };
-use n0_future::{boxed::BoxStream, task, Stream, StreamExt};
+use n0_future::{Stream, StreamExt, boxed::BoxStream, task};
 use serde::{Deserialize, Serialize};
 use tokio::sync::broadcast;
 use tokio_stream::wrappers::BroadcastStream;
@@ -46,7 +46,7 @@ impl EchoNode {
         &self,
         node_id: NodeId,
         payload: String,
-    ) -> impl Stream<Item = ConnectEvent> + Unpin {
+    ) -> impl Stream<Item = ConnectEvent> + Unpin + use<> {
         let (event_sender, event_receiver) = async_channel::bounded(16);
         let endpoint = self.router.endpoint().clone();
         task::spawn(async move {

browser-echo/src/wasm.rs

@@ -3,8 +3,8 @@ use n0_future::{Stream, StreamExt};
 use serde::Serialize;
 use tracing::level_filters::LevelFilter;
 use tracing_subscriber_wasm::MakeConsoleWriter;
-use wasm_bindgen::{prelude::wasm_bindgen, JsError, JsValue};
-use wasm_streams::{readable::sys::ReadableStream as JsReadableStream, ReadableStream};
+use wasm_bindgen::{JsError, JsValue, prelude::wasm_bindgen};
+use wasm_streams::{ReadableStream, readable::sys::ReadableStream as JsReadableStream};
 
 use crate::node;
 

dumbpipe-web/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "reverse-proxy"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0/MIT"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

dumbpipe-web/src/main.rs

@@ -7,7 +7,7 @@ use std::{
 use anyhow::Context;
 use bytes::Bytes;
 use clap::Parser;
-use http_body_util::{combinators::BoxBody, BodyExt, Full};
+use http_body_util::{BodyExt, Full, combinators::BoxBody};
 use hyper::client::conn::http1::Builder;
 use hyper::server::conn::http1;
 use hyper::service::service_fn;

extism/host/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "extism-host"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 anyhow = "1.0.79"
 extism = "1.0.0"
 tokio = { version = "1", features = ["full"] }
-iroh-extism-host-functions = { path = "../iroh-extism-host-functions" }
+iroh-extism-host-functions = { path = "../iroh-extism-host-functions" }

extism/iroh-extism-host-functions/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "iroh-extism-host-functions"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 anyhow = "1.0.79"

extism/iroh-extism-host-functions/src/lib.rs

@@ -1,9 +1,9 @@
 use std::{path::PathBuf, str::FromStr};
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use extism::*;
 use futures::stream::StreamExt;
-use iroh::{protocol::Router, Endpoint, NodeId};
+use iroh::{Endpoint, NodeId, protocol::Router};
 use iroh_blobs::{api::downloader::Shuffled, net_protocol::Blobs, store::fs::FsStore};
 
 const IROH_EXTISM_DATA_DIR: &str = "iroh-extism";

extism/plugin/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "plugin"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [lib]
-crate_type = ["cdylib"]
+crate-type = ["cdylib"]
 
 [dependencies]
 extism-pdk = "1.0.1"

frosty/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "frosty"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 anyhow = "1.0.89"

frosty/src/main.rs

@@ -1,14 +1,14 @@
 use clap::Parser;
 use frost_ed25519::{
-    self as frost,
+    self as frost, Ciphersuite, Ed25519ScalarField, Ed25519Sha512, Field, Group, Identifier,
+    SigningPackage,
     keys::{IdentifierList, KeyPackage, PublicKeyPackage, SecretShare},
-    Ciphersuite, Ed25519ScalarField, Ed25519Sha512, Field, Group, Identifier, SigningPackage,
 };
 use futures::StreamExt;
 use iroh::{
+    PublicKey, SecretKey, Watcher,
     discovery::{dns::DnsDiscovery, pkarr::PkarrPublisher},
     endpoint::{RecvStream, SendStream},
-    PublicKey, SecretKey, Watcher,
 };
 use rand::thread_rng;
 use sha2::{Digest, Sha512};

iroh-automerge/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "iroh-automerge"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 anyhow = "1.0.80"

iroh-automerge/src/main.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
-use automerge::{transaction::Transactable, Automerge, ReadDoc};
+use automerge::{Automerge, ReadDoc, transaction::Transactable};
 use clap::Parser;
-use iroh::{protocol::Router, Endpoint};
+use iroh::{Endpoint, protocol::Router};
 use protocol::IrohAutomergeProtocol;
 use tokio::sync::mpsc;
 

iroh-automerge/src/protocol.rs

@@ -2,15 +2,15 @@ use std::sync::Arc;
 
 use anyhow::Result;
 use automerge::{
-    sync::{self, SyncDoc},
     Automerge,
+    sync::{self, SyncDoc},
 };
 use iroh::{
     endpoint::{Connection, RecvStream, SendStream},
     protocol::{AcceptError, ProtocolHandler},
 };
 use serde::{Deserialize, Serialize};
-use tokio::sync::{mpsc, Mutex};
+use tokio::sync::{Mutex, mpsc};
 
 #[derive(Debug, Clone)]
 pub struct IrohAutomergeProtocol {

iroh-gateway/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "iroh-gateway"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 axum = "0.7.3"

iroh-gateway/src/cert_util.rs

@@ -2,7 +2,7 @@
 use std::path::Path;
 
 use anyhow::{Context, Result};
-use rustls::pki_types::{pem::PemObject, CertificateDer, PrivateKeyDer};
+use rustls::pki_types::{CertificateDer, PrivateKeyDer, pem::PemObject};
 
 pub fn load_certs<'a>(filename: impl AsRef<Path>) -> Result<Vec<CertificateDer<'a>>> {
     println!("loading certs from {}", filename.as_ref().display());

iroh-gateway/src/main.rs

@@ -7,37 +7,37 @@ use std::{
 use anyhow::Context;
 use args::CertMode;
 use axum::{
+    Extension, Router,
     body::Body,
     extract::Path,
-    http::{header, Method, Request, StatusCode},
+    http::{Method, Request, StatusCode, header},
     response::{IntoResponse, Response},
     routing::get,
-    Extension, Router,
 };
-use bao_tree::{io::fsm::BaoContentItem, ChunkNum};
-use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine};
+use bao_tree::{ChunkNum, io::fsm::BaoContentItem};
+use base64::{Engine, engine::general_purpose::URL_SAFE_NO_PAD};
 use bytes::Bytes;
 use clap::Parser;
 use derive_more::Deref;
-use futures::{pin_mut, StreamExt};
+use futures::{StreamExt, pin_mut};
 use hyper::body::Incoming;
 use hyper_util::rt::{TokioExecutor, TokioIo};
-use iroh::{discovery::dns::DnsDiscovery, endpoint::Connection, Endpoint, NodeAddr, NodeId};
+use iroh::{Endpoint, NodeAddr, NodeId, discovery::dns::DnsDiscovery, endpoint::Connection};
 use iroh_base::ticket::NodeTicket;
 use iroh_blobs::{
+    BlobFormat, Hash,
     format::collection::Collection,
     get::fsm::{BlobContentNext, ConnectedNext, DecodeError, EndBlobNext},
-    protocol::{ChunkRangesSeq, ALPN},
+    protocol::{ALPN, ChunkRangesSeq},
     ticket::BlobTicket,
-    BlobFormat, Hash,
 };
 use lru::LruCache;
 use mime::Mime;
 use mime_classifier::MimeClassifier;
 use range_collections::RangeSet2;
 use ranges::parse_byte_range;
 use tokio::net::TcpListener;
-use tokio_rustls_acme::{caches::DirCache, tokio_rustls::TlsAcceptor, AcmeConfig};
+use tokio_rustls_acme::{AcmeConfig, caches::DirCache, tokio_rustls::TlsAcceptor};
 use tower_http::cors::{AllowHeaders, AllowOrigin, CorsLayer};
 use tower_service::Service;
 use url::Url;
@@ -345,7 +345,7 @@ async fn collection_index(
     connection: Connection,
     hash: &Hash,
     link_prefix: &str,
-) -> anyhow::Result<impl IntoResponse> {
+) -> anyhow::Result<impl IntoResponse + use<>> {
     fn encode_relative_url(relative_url: &str) -> anyhow::Result<String> {
         let base = Url::parse("http://example.com")?;
         let joined_url = base.join(relative_url)?;
@@ -383,7 +383,7 @@ async fn forward_collection_range(
     hash: &Hash,
     suffix: &str,
     range: (Option<u64>, Option<u64>),
-) -> anyhow::Result<impl IntoResponse> {
+) -> anyhow::Result<impl IntoResponse + use<>> {
     let suffix = suffix.strip_prefix('/').unwrap_or(suffix);
     tracing::trace!("suffix {}", suffix);
     let collection = get_collection(gateway, hash, &connection).await?;

iroh-gateway/src/ranges.rs

@@ -6,7 +6,7 @@ use bao_tree::ChunkNum;
 use bytes::Bytes;
 use headers::{HeaderMapExt, Range};
 use hyper::Request;
-use range_collections::{range_set::RangeSetRange, RangeSet2};
+use range_collections::{RangeSet2, range_set::RangeSetRange};
 
 /// Given a range specified as arbitrary range bounds, normalize it into a range
 /// that has inclusive start and exclusive end.