From 29c456c081bb3eacf2a8c6bbbef0828c18ba0c6f Mon Sep 17 00:00:00 2001
From: Asmir Avdicevic <asmir.avdicevic64@gmail.com>
Date: Mon, 18 Nov 2024 10:38:02 +0100
Subject: [PATCH] another pass

---
 Cargo.lock                      | 100 ++++++++++++++++----------------
 iroh-base/Cargo.toml            |   2 +-
 iroh-cli/Cargo.toml             |   2 +-
 iroh-dns-server/Cargo.toml      |   2 +-
 iroh-metrics/Cargo.toml         |   2 +-
 iroh-net/Cargo.toml             |   2 +-
 iroh-relay/Cargo.toml           |   2 +-
 iroh/Cargo.toml                 |   2 +-
 net-tools/netwatch/Cargo.toml   |   2 +-
 net-tools/portmapper/Cargo.toml |   2 +-
 10 files changed, 58 insertions(+), 60 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 21d4d6a8a01..9edd73e6f01 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -175,7 +175,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -1185,7 +1185,7 @@ checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de"
 dependencies = [
  "console",
  "shell-words",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -1472,9 +1472,9 @@ dependencies = [
 
 [[package]]
 name = "erased_set"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a5aa24577083f8190ad401e376b55887c7cd9083ae95d83ceec5d28ea78125"
+checksum = "a02a5d186d7bf1cb21f1f95e1a9cfa5c1f2dcd803a47aad454423ceec13525c5"
 
 [[package]]
 name = "errno"
@@ -1618,7 +1618,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8835f84f38484cc86f110a805655697908257fb9a7af005234060891557198e9"
 dependencies = [
  "nonempty",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -2041,7 +2041,7 @@ dependencies = [
  "ipnet",
  "once_cell",
  "rand",
- "thiserror",
+ "thiserror 1.0.69",
  "tinyvec",
  "tokio",
  "tracing",
@@ -2071,7 +2071,7 @@ dependencies = [
  "rustls",
  "rustls-pemfile",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "tinyvec",
  "tokio",
@@ -2097,7 +2097,7 @@ dependencies = [
  "lru-cache",
  "parking_lot",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
 ]
@@ -2120,7 +2120,7 @@ dependencies = [
  "rustls",
  "serde",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-rustls",
  "tracing",
@@ -2144,7 +2144,7 @@ dependencies = [
  "prefix-trie",
  "rustls",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "tokio",
  "tokio-rustls",
@@ -2710,7 +2710,7 @@ dependencies = [
  "tempfile",
  "testdir",
  "testresult",
- "thiserror",
+ "thiserror 2.0.3",
  "tokio",
  "tokio-stream",
  "tokio-util",
@@ -2744,7 +2744,7 @@ dependencies = [
  "serde_json",
  "serde_test",
  "ssh-key",
- "thiserror",
+ "thiserror 2.0.3",
  "ttl_cache",
  "url",
  "zeroize",
@@ -2766,7 +2766,7 @@ dependencies = [
 [[package]]
 name = "iroh-blobs"
 version = "0.28.1"
-source = "git+https://github.com/n0-computer/iroh-blobs?branch=main#4c7b8e79f495376245852a14688ce23a12adda85"
+source = "git+https://github.com/n0-computer/iroh-blobs?branch=main#290eb42cfd2d13202208264c2674ce423829f571"
 dependencies = [
  "anyhow",
  "async-channel",
@@ -2806,7 +2806,7 @@ dependencies = [
  "smallvec",
  "strum",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 2.0.3",
  "tokio",
  "tokio-util",
  "tracing",
@@ -2861,7 +2861,7 @@ dependencies = [
  "strum",
  "tempfile",
  "testdir",
- "thiserror",
+ "thiserror 2.0.3",
  "time",
  "tokio",
  "tokio-util",
@@ -2957,7 +2957,7 @@ dependencies = [
  "serde-error",
  "strum",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 2.0.3",
  "tokio",
  "tokio-stream",
  "tokio-util",
@@ -2967,7 +2967,7 @@ dependencies = [
 [[package]]
 name = "iroh-gossip"
 version = "0.28.1"
-source = "git+https://github.com/n0-computer/iroh-gossip?branch=main#0eba891f601b0a425be3f3a8a870d0c75eacc509"
+source = "git+https://github.com/n0-computer/iroh-gossip?branch=main#ba0f6b0f54a740d8eae7ee6683f4aa1d8d8c8eb2"
 dependencies = [
  "anyhow",
  "async-channel",
@@ -3101,7 +3101,7 @@ dependencies = [
  "surge-ping",
  "swarm-discovery",
  "testresult",
- "thiserror",
+ "thiserror 2.0.3",
  "time",
  "tokio",
  "tokio-rustls",
@@ -3153,7 +3153,7 @@ dependencies = [
  "rustc-hash",
  "rustls",
  "socket2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
 ]
@@ -3171,7 +3171,7 @@ dependencies = [
  "rustls",
  "rustls-platform-verifier",
  "slab",
- "thiserror",
+ "thiserror 1.0.69",
  "tinyvec",
  "tracing",
 ]
@@ -3237,7 +3237,7 @@ dependencies = [
  "smallvec",
  "socket2",
  "stun-rs",
- "thiserror",
+ "thiserror 2.0.3",
  "time",
  "tokio",
  "tokio-rustls",
@@ -3329,7 +3329,7 @@ dependencies = [
  "combine",
  "jni-sys",
  "log",
- "thiserror",
+ "thiserror 1.0.69",
  "walkdir",
 ]
 
@@ -3466,7 +3466,7 @@ dependencies = [
  "serde_bencode",
  "serde_bytes",
  "sha1_smol",
- "thiserror",
+ "thiserror 1.0.69",
  "tracing",
 ]
 
@@ -3638,7 +3638,7 @@ dependencies = [
  "anyhow",
  "byteorder",
  "paste",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3652,7 +3652,7 @@ dependencies = [
  "log",
  "netlink-packet-core",
  "netlink-sys",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -3688,7 +3688,7 @@ dependencies = [
  "rtnetlink",
  "serde",
  "socket2",
- "thiserror",
+ "thiserror 2.0.3",
  "time",
  "tokio",
  "tokio-util",
@@ -4111,7 +4111,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442"
 dependencies = [
  "memchr",
- "thiserror",
+ "thiserror 1.0.69",
  "ucd-trie",
 ]
 
@@ -4199,7 +4199,7 @@ dependencies = [
  "rand",
  "self_cell",
  "simple-dns",
- "thiserror",
+ "thiserror 1.0.69",
  "tracing",
  "ureq",
  "wasm-bindgen",
@@ -4337,7 +4337,7 @@ dependencies = [
  "serde",
  "smallvec",
  "socket2",
- "thiserror",
+ "thiserror 2.0.3",
  "time",
  "tokio",
  "tokio-util",
@@ -4622,7 +4622,7 @@ dependencies = [
  "rustc-hash",
  "rustls",
  "socket2",
- "thiserror",
+ "thiserror 2.0.3",
  "tokio",
  "tracing",
 ]
@@ -4641,7 +4641,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "slab",
- "thiserror",
+ "thiserror 2.0.3",
  "tinyvec",
  "tracing",
  "web-time",
@@ -4851,7 +4851,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
  "getrandom",
  "libredox",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -5046,7 +5046,7 @@ dependencies = [
  "netlink-packet-utils",
  "netlink-proto",
  "netlink-sys",
- "nix 0.26.4",
+ "nix 0.27.1",
  "thiserror 1.0.69",
  "tokio",
 ]
@@ -5787,7 +5787,7 @@ dependencies = [
  "pnet_packet",
  "rand",
  "socket2",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
 ]
@@ -5940,25 +5940,23 @@ version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.69",
 ]
 
 [[package]]
-name = "thiserror-impl"
-version = "1.0.69"
+name = "thiserror"
+version = "2.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.87",
+ "thiserror-impl 2.0.3",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.3"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6115,7 +6113,7 @@ dependencies = [
  "rustls",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "tokio",
  "tokio-rustls",
@@ -6186,7 +6184,7 @@ dependencies = [
  "http 1.1.0",
  "httparse",
  "js-sys",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-tungstenite 0.21.0",
  "wasm-bindgen",
@@ -6315,7 +6313,7 @@ dependencies = [
  "http 1.1.0",
  "pin-project",
  "thiserror 1.0.69",
- "tower 0.4.13",
+ "tower 0.5.1",
  "tracing",
 ]
 
@@ -6338,7 +6336,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf"
 dependencies = [
  "crossbeam-channel",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "tracing-subscriber",
 ]
@@ -6433,7 +6431,7 @@ dependencies = [
  "log",
  "rand",
  "sha1",
- "thiserror",
+ "thiserror 1.0.69",
  "url",
  "utf-8",
 ]
@@ -6740,7 +6738,7 @@ dependencies = [
  "event-listener 4.0.3",
  "futures-util",
  "parking_lot",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -7100,7 +7098,7 @@ dependencies = [
  "futures",
  "log",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "windows 0.58.0",
  "windows-core 0.58.0",
 ]
@@ -7130,7 +7128,7 @@ dependencies = [
  "nom",
  "oid-registry",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
diff --git a/iroh-base/Cargo.toml b/iroh-base/Cargo.toml
index 7ee64f25718..3260200a715 100644
--- a/iroh-base/Cargo.toml
+++ b/iroh-base/Cargo.toml
@@ -23,7 +23,7 @@ hex = "0.4.3"
 postcard = { version = "1", default-features = false, features = ["alloc", "use-std", "experimental-derive"], optional = true }
 redb = { version = "2.0.0", optional = true }
 serde = { version = "1", features = ["derive"] }
-thiserror = "1"
+thiserror = "2"
 
 # key module
 aead = { version = "0.5.2", features = ["bytes"], optional = true }
diff --git a/iroh-cli/Cargo.toml b/iroh-cli/Cargo.toml
index 2fa6dec7f49..712d3b466fd 100644
--- a/iroh-cli/Cargo.toml
+++ b/iroh-cli/Cargo.toml
@@ -60,7 +60,7 @@ shell-words = "1.1.0"
 shellexpand = "3.1.0"
 strum = { version = "0.26", features = ["derive"] }
 tempfile = "3.10.1"
-thiserror = "1"
+thiserror = "2"
 time = { version = "0.3", features = ["formatting"] }
 tokio = { version = "1.36.0", features = ["full"] }
 tokio-util = { version = "0.7", features = ["rt"] }
diff --git a/iroh-dns-server/Cargo.toml b/iroh-dns-server/Cargo.toml
index 7faeff34991..4aed99794cf 100644
--- a/iroh-dns-server/Cargo.toml
+++ b/iroh-dns-server/Cargo.toml
@@ -33,7 +33,7 @@ iroh-metrics = { version = "0.28.0" }
 lru = "0.12.3"
 parking_lot = "0.12.1"
 pkarr = { version = "2.2.0", features = [ "async", "relay", "dht"], default-features = false }
-rcgen = "0.12.1"
+rcgen = "0.13"
 redb = "2.0.0"
 regex = "1.10.3"
 rustls = { version = "0.23", default-features = false, features = ["ring"] }
diff --git a/iroh-metrics/Cargo.toml b/iroh-metrics/Cargo.toml
index 2a34c39f2f4..83173d350aa 100644
--- a/iroh-metrics/Cargo.toml
+++ b/iroh-metrics/Cargo.toml
@@ -16,7 +16,7 @@ workspace = true
 
 [dependencies]
 anyhow = { version = "1" }
-erased_set = "0.7"
+erased_set = "0.8"
 http-body-util = "0.1.0"
 hyper = { version = "1", features = ["server", "http1"] }
 hyper-util = { version = "0.1.1", features = ["tokio"] }
diff --git a/iroh-net/Cargo.toml b/iroh-net/Cargo.toml
index f5bb0837963..289ffd0371c 100644
--- a/iroh-net/Cargo.toml
+++ b/iroh-net/Cargo.toml
@@ -82,7 +82,7 @@ smallvec = "1.11.1"
 socket2 = "0.5.3"
 stun-rs = "0.1.5"
 surge-ping = "0.8.0"
-thiserror = "1"
+thiserror = "2"
 time = "0.3.20"
 tokio = { version = "1", features = [
     "io-util",
diff --git a/iroh-relay/Cargo.toml b/iroh-relay/Cargo.toml
index 5d2492c3c62..ec3956d3d02 100644
--- a/iroh-relay/Cargo.toml
+++ b/iroh-relay/Cargo.toml
@@ -63,7 +63,7 @@ serde = { version = "1", features = ["derive", "rc"] }
 smallvec = "1.11.1"
 socket2 = "0.5.3"
 stun-rs = "0.1.5"
-thiserror = "1"
+thiserror = "2"
 time = "0.3.20"
 tokio = { version = "1", features = [
     "io-util",
diff --git a/iroh/Cargo.toml b/iroh/Cargo.toml
index 2d0080462a5..f7e312b17b3 100644
--- a/iroh/Cargo.toml
+++ b/iroh/Cargo.toml
@@ -46,7 +46,7 @@ quinn = { package = "iroh-quinn", version = "0.12" }
 rand = "0.8"
 serde = { version = "1", features = ["derive"] }
 strum = { version = "0.26", features = ["derive"] }
-thiserror = "1"
+thiserror = "2"
 tempfile = "3.4"
 tokio = { version = "1", features = ["io-util", "rt"] }
 tokio-stream = "0.1"
diff --git a/net-tools/netwatch/Cargo.toml b/net-tools/netwatch/Cargo.toml
index f859315e362..ac6554a6d01 100644
--- a/net-tools/netwatch/Cargo.toml
+++ b/net-tools/netwatch/Cargo.toml
@@ -22,7 +22,7 @@ libc = "0.2.139"
 netdev = "0.31.0"
 once_cell = "1.18.0"
 socket2 = "0.5.3"
-thiserror = "1"
+thiserror = "2"
 time = "0.3.20"
 tokio = { version = "1", features = ["io-util", "macros", "sync", "rt", "net", "fs", "io-std", "signal", "process", "time"] }
 tokio-util = { version = "0.7", features = ["rt"] }
diff --git a/net-tools/portmapper/Cargo.toml b/net-tools/portmapper/Cargo.toml
index ce91382178b..dbaa8e99dff 100644
--- a/net-tools/portmapper/Cargo.toml
+++ b/net-tools/portmapper/Cargo.toml
@@ -28,7 +28,7 @@ rand = "0.8"
 serde = { version = "1", features = ["derive", "rc"] }
 smallvec = "1.11.1"
 socket2 = "0.5.3"
-thiserror = "1"
+thiserror = "2"
 time = "0.3.20"
 tokio = { version = "1", features = ["io-util", "macros", "sync", "rt", "net", "fs", "io-std", "signal", "process"] }
 tokio-util = { version = "0.7", features = ["io-util", "io", "codec", "rt"] }