From 1d72e0fce0f954375b39ff24cfe2215863618e8b Mon Sep 17 00:00:00 2001
From: dignifiedquire <me@dignifiedquire.com>
Date: Fri, 24 May 2024 12:08:41 +0200
Subject: [PATCH 1/3] feat: update and cleanup deps

---
 Cargo.lock                      | 139 +++++++++++++++-----------------
 Cargo.toml                      |   7 +-
 examples/split/types/Cargo.toml |   2 +-
 3 files changed, 67 insertions(+), 81 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5ef3245..a9a5a64 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23,18 +23,6 @@ version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
-[[package]]
-name = "arrayref"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-
 [[package]]
 name = "async-stream"
 version = "0.3.5"
@@ -54,7 +42,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -90,6 +78,12 @@ version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -105,19 +99,6 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
-[[package]]
-name = "blake3"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
-dependencies = [
- "arrayref",
- "arrayvec",
- "cc",
- "cfg-if",
- "constant_time_eq",
-]
-
 [[package]]
 name = "bumpalo"
 version = "3.16.0"
@@ -157,18 +138,6 @@ dependencies = [
  "types",
 ]
 
-[[package]]
-name = "constant_time_eq"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
-
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -196,17 +165,30 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "0.99.17"
+version = "1.0.0-beta.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+checksum = "f7abbfc297053be59290e3152f8cbcd52c8642e0728b69ee187d991d4c1af08d"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "1.0.0-beta.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e"
 dependencies = [
- "convert_case",
  "proc-macro2",
  "quote",
- "rustc_version",
- "syn 1.0.109",
+ "syn 2.0.66",
 ]
 
+[[package]]
+name = "doctest-file"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562"
+
 [[package]]
 name = "educe"
 version = "0.4.23"
@@ -229,7 +211,7 @@ dependencies = [
  "num-traits",
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -352,7 +334,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -511,10 +493,11 @@ dependencies = [
 
 [[package]]
 name = "interprocess"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4d0250d41da118226e55b3d50ca3f0d9e0a0f6829b92f543ac0054aeea1572"
+checksum = "13f2533e1f1a70bec71ea7a85d1c0a4dab141c314035ce76e51a19a2f48be708"
 dependencies = [
+ "doctest-file",
  "futures-core",
  "libc",
  "recvmsg",
@@ -774,6 +757,16 @@ dependencies = [
  "base64 0.13.1",
 ]
 
+[[package]]
+name = "pem"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
+dependencies = [
+ "base64 0.22.1",
+ "serde",
+]
+
 [[package]]
 name = "pin-project"
 version = "1.1.5"
@@ -791,7 +784,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -834,7 +827,6 @@ dependencies = [
  "anyhow",
  "async-stream",
  "bincode",
- "blake3",
  "bytes",
  "derive_more",
  "educe",
@@ -851,7 +843,7 @@ dependencies = [
  "iroh-quinn-udp",
  "pin-project",
  "proc-macro2",
- "rcgen",
+ "rcgen 0.12.1",
  "rustls",
  "serde",
  "tempfile",
@@ -908,12 +900,24 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
 dependencies = [
- "pem",
+ "pem 1.1.1",
  "ring 0.16.20",
  "time",
  "yasna",
 ]
 
+[[package]]
+name = "rcgen"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1"
+dependencies = [
+ "pem 3.0.4",
+ "ring 0.17.8",
+ "time",
+ "yasna",
+]
+
 [[package]]
 name = "recvmsg"
 version = "1.0.0"
@@ -971,15 +975,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "rustix"
 version = "0.38.34"
@@ -1084,12 +1079,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "semver"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
-
 [[package]]
 name = "serde"
 version = "1.0.202"
@@ -1107,7 +1096,7 @@ checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1119,7 +1108,7 @@ dependencies = [
  "futures",
  "iroh-quinn",
  "quic-rpc",
- "rcgen",
+ "rcgen 0.10.0",
  "rustls",
  "serde",
  "tokio",
@@ -1198,9 +1187,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.65"
+version = "2.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1236,7 +1225,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1316,7 +1305,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1373,7 +1362,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1487,7 +1476,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
  "wasm-bindgen-shared",
 ]
 
@@ -1509,7 +1498,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.66",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index e12027c..457c7ab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,12 +12,10 @@ description = "A streaming rpc system based on quic"
 # Sadly this also needs to be updated in .github/workflows/ci.yml
 rust-version = "1.76"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 bincode = { version = "1.3.3", optional = true }
 bytes = { version = "1", optional = true }
-derive_more = "0.99.17"
+derive_more = "1.0.0-beta.6"
 flume = { version = "0.11", optional = true }
 futures-lite = "2.3.0"
 futures-sink = "0.3.30"
@@ -33,7 +31,6 @@ tracing = "0.1"
 quinn-udp = { package = "iroh-quinn-udp", version = "0.4.0", optional = true }
 interprocess = { version = "2.1", features = ["tokio"], optional = true }
 hex = "0.4.3"
-blake3 = "1.4.1"
 futures = { version = "0.3.30", optional = true }
 
 [dependencies.educe]
@@ -49,7 +46,7 @@ async-stream = "0.3.3"
 serde = { version = "1", features = ["derive"] }
 tokio = { version = "1", features = ["full"] }
 quinn = { package = "iroh-quinn", version = "0.10" }
-rcgen = "0.10.0"
+rcgen = "0.12"
 rustls = "0.21"
 thousands = "0.2.0"
 tracing-subscriber = "0.3.16"
diff --git a/examples/split/types/Cargo.toml b/examples/split/types/Cargo.toml
index ef680c0..3943e24 100644
--- a/examples/split/types/Cargo.toml
+++ b/examples/split/types/Cargo.toml
@@ -9,4 +9,4 @@ edition = "2021"
 futures = "0.3.26"
 quic-rpc = { path = "../../..", features = ["macros"] }
 serde = { version = "1", features = ["derive"] }
-derive_more = "0.99.17"
+derive_more = "1.0.0-beta.6"

From 617c45f7f702beaa6982fd1c50f7dfc9af61173a Mon Sep 17 00:00:00 2001
From: dignifiedquire <me@dignifiedquire.com>
Date: Fri, 24 May 2024 12:10:53 +0200
Subject: [PATCH 2/3] fixup

---
 Cargo.lock                      | 8 +++++++-
 Cargo.toml                      | 2 +-
 examples/split/types/Cargo.toml | 1 -
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a9a5a64..5d094a8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -181,6 +181,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.66",
+ "unicode-xid",
 ]
 
 [[package]]
@@ -1410,7 +1411,6 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 name = "types"
 version = "0.1.0"
 dependencies = [
- "derive_more",
  "futures",
  "quic-rpc",
  "serde",
@@ -1422,6 +1422,12 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
+[[package]]
+name = "unicode-xid"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+
 [[package]]
 name = "untrusted"
 version = "0.7.1"
diff --git a/Cargo.toml b/Cargo.toml
index 457c7ab..0f27465 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,7 @@ rust-version = "1.76"
 [dependencies]
 bincode = { version = "1.3.3", optional = true }
 bytes = { version = "1", optional = true }
-derive_more = "1.0.0-beta.6"
+derive_more = { version = "1.0.0-beta.6", features = ["from", "try_into", "display"] }
 flume = { version = "0.11", optional = true }
 futures-lite = "2.3.0"
 futures-sink = "0.3.30"
diff --git a/examples/split/types/Cargo.toml b/examples/split/types/Cargo.toml
index 3943e24..9a2d9fc 100644
--- a/examples/split/types/Cargo.toml
+++ b/examples/split/types/Cargo.toml
@@ -9,4 +9,3 @@ edition = "2021"
 futures = "0.3.26"
 quic-rpc = { path = "../../..", features = ["macros"] }
 serde = { version = "1", features = ["derive"] }
-derive_more = "1.0.0-beta.6"

From 71999ab7d14fb479f96502f008b6b0395d1fcd80 Mon Sep 17 00:00:00 2001
From: dignifiedquire <me@dignifiedquire.com>
Date: Fri, 24 May 2024 12:14:46 +0200
Subject: [PATCH 3/3] fixup

---
 Cargo.lock                       | 34 ++++----------------------------
 examples/split/server/Cargo.toml |  2 +-
 examples/split/types/Cargo.toml  |  1 +
 3 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5d094a8..0b67f49 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -66,12 +66,6 @@ dependencies = [
  "rustc-demangle",
 ]
 
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
 [[package]]
 name = "base64"
 version = "0.21.7"
@@ -749,15 +743,6 @@ dependencies = [
  "windows-targets 0.52.5",
 ]
 
-[[package]]
-name = "pem"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
-dependencies = [
- "base64 0.13.1",
-]
-
 [[package]]
 name = "pem"
 version = "3.0.4"
@@ -844,7 +829,7 @@ dependencies = [
  "iroh-quinn-udp",
  "pin-project",
  "proc-macro2",
- "rcgen 0.12.1",
+ "rcgen",
  "rustls",
  "serde",
  "tempfile",
@@ -895,25 +880,13 @@ dependencies = [
  "getrandom",
 ]
 
-[[package]]
-name = "rcgen"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
-dependencies = [
- "pem 1.1.1",
- "ring 0.16.20",
- "time",
- "yasna",
-]
-
 [[package]]
 name = "rcgen"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1"
 dependencies = [
- "pem 3.0.4",
+ "pem",
  "ring 0.17.8",
  "time",
  "yasna",
@@ -1109,7 +1082,7 @@ dependencies = [
  "futures",
  "iroh-quinn",
  "quic-rpc",
- "rcgen 0.10.0",
+ "rcgen",
  "rustls",
  "serde",
  "tokio",
@@ -1411,6 +1384,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 name = "types"
 version = "0.1.0"
 dependencies = [
+ "derive_more",
  "futures",
  "quic-rpc",
  "serde",
diff --git a/examples/split/server/Cargo.toml b/examples/split/server/Cargo.toml
index 71d9576..d87c3ea 100644
--- a/examples/split/server/Cargo.toml
+++ b/examples/split/server/Cargo.toml
@@ -12,7 +12,7 @@ futures = "0.3.26"
 tracing-subscriber = "0.3.16"
 quic-rpc = { path = "../../..", features = ["quinn-transport", "macros"] }
 quinn = { package = "iroh-quinn", version = "0.10" }
-rcgen = "0.10.0"
+rcgen = "0.12.0"
 rustls = "0.21"
 serde = { version = "1", features = ["derive"] }
 tokio = { version = "1", features = ["full"] }
diff --git a/examples/split/types/Cargo.toml b/examples/split/types/Cargo.toml
index 9a2d9fc..2adb90f 100644
--- a/examples/split/types/Cargo.toml
+++ b/examples/split/types/Cargo.toml
@@ -9,3 +9,4 @@ edition = "2021"
 futures = "0.3.26"
 quic-rpc = { path = "../../..", features = ["macros"] }
 serde = { version = "1", features = ["derive"] }
+derive_more = { version = "1.0.0-beta.6", features = ["from", "try_into"] }