Merge branch 'add-rpc' into try-out-new-rpc

# Conflicts:
#	Cargo.toml

Author: rklaehn

Cargo.toml

@@ -30,16 +30,16 @@ iroh-io = { version = "0.6.0", features = ["stats"] }
 iroh-metrics = { version = "0.28.0", default-features = false }
 iroh-net = { version = "0.28.1" }
 iroh-router = "0.28.0"
+nested_enum_utils = { version = "0.1.0", optional = true }
 num_cpus = "1.15.0"
-nested_enum_utils = { version = "0.1", optional = true }
 oneshot = "0.1.8"
 parking_lot = { version = "0.12.1", optional = true }
 pin-project = "1.1.5"
 portable-atomic = { version = "1", optional = true }
 postcard = { version = "1", default-features = false, features = ["alloc", "use-std", "experimental-derive"] }
-quinn = { package = "iroh-quinn", version = "0.12", features = ["ring"] }
 quic-rpc = { git = "https://github.com/n0-computer/quic-rpc.git", branch = "map-transports-not-services", optional = true }
 quic-rpc-derive = { git = "https://github.com/n0-computer/quic-rpc.git", branch = "map-transports-not-services", optional = true }
+quinn = { package = "iroh-quinn", version = "0.12", features = ["ring"] }
 rand = "0.8"
 range-collections = "0.4.0"
 redb = { version = "2.0.0", optional = true }
@@ -82,9 +82,6 @@ fs-store = ["dep:reflink-copy", "redb", "dep:redb_v1", "dep:tempfile"]
 metrics = ["iroh-metrics/metrics"]
 redb = ["dep:redb"]
 rpc = ["dep:quic-rpc", "dep:quic-rpc-derive", "dep:nested_enum_utils", "dep:strum", "dep:futures-util", "dep:ref-cast", "dep:portable-atomic", "dep:walkdir", "downloader"]
-ref-cast = ["dep:ref-cast"]
-portable-atomic = ["dep:portable-atomic"]
-walkdir = ["dep:walkdir"]
 
 [package.metadata.docs.rs]
 all-features = true