From 3b3f7fc5dffbf113ba6307a686f01dc75088f8ba Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 18 Aug 2024 04:37:20 +0000
Subject: [PATCH] Update Rust crate tokio to v1.39.3

---
 Cargo.lock | 127 ++++++++++++++++++++++++++++++++++-------------------
 Cargo.toml |  14 +++---
 2 files changed, 88 insertions(+), 53 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6b0fed249..580962954 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -432,7 +432,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26d4d6dafc1a3bb54687538972158f07b2c948bc57d5890df22c0739098b3028"
 dependencies = [
  "borsh-derive",
- "cfg_aliases 0.1.1",
+ "cfg_aliases",
 ]
 
 [[package]]
@@ -555,12 +555,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
-[[package]]
-name = "cfg_aliases"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
-
 [[package]]
 name = "chrono"
 version = "0.4.38"
@@ -660,7 +654,7 @@ dependencies = [
  "crucible-protocol",
  "crucible-workspace-hack",
  "serde_json",
- "strum",
+ "strum 0.26.1",
  "strum_macros 0.26.1",
  "tokio",
 ]
@@ -782,7 +776,7 @@ dependencies = [
  "bitflags 2.5.0",
  "crossterm_winapi",
  "libc",
- "mio",
+ "mio 0.8.9",
  "parking_lot",
  "serde",
  "signal-hook",
@@ -923,7 +917,7 @@ dependencies = [
  "atty",
  "crucible-workspace-hack",
  "dropshot",
- "nix 0.29.0",
+ "nix 0.28.0",
  "proptest",
  "rusqlite",
  "rustls-pemfile 1.0.4",
@@ -983,11 +977,11 @@ dependencies = [
  "itertools",
  "libc",
  "mime_guess",
- "nix 0.29.0",
+ "nix 0.28.0",
  "omicron-common",
  "openapi-lint",
  "openapiv3",
- "opentelemetry 0.24.0",
+ "opentelemetry 0.22.0",
  "opentelemetry-jaeger",
  "oximeter",
  "oximeter-producer",
@@ -1030,7 +1024,7 @@ dependencies = [
  "crucible",
  "crucible-common",
  "crucible-workspace-hack",
- "opentelemetry 0.24.0",
+ "opentelemetry 0.22.0",
  "opentelemetry-jaeger",
  "rand 0.8.5",
  "tokio",
@@ -1213,7 +1207,7 @@ dependencies = [
  "libc",
  "log",
  "memchr",
- "mio",
+ "mio 0.8.9",
  "num-integer",
  "num-iter",
  "num-traits",
@@ -1708,13 +1702,13 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "fd-lock"
-version = "4.0.2"
+version = "3.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947"
+checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5"
 dependencies = [
  "cfg-if",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2043,9 +2037,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.3"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hex"
@@ -2427,7 +2421,7 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
- "hermit-abi 0.3.3",
+ "hermit-abi 0.3.9",
  "libc",
  "windows-sys 0.52.0",
 ]
@@ -2695,6 +2689,18 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "mio"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+dependencies = [
+ "hermit-abi 0.3.9",
+ "libc",
+ "wasi",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "multer"
 version = "3.1.0"
@@ -2824,7 +2830,7 @@ dependencies = [
  "slog",
  "slog-error-chain",
  "steno",
- "strum",
+ "strum 0.26.1",
  "thiserror",
  "uuid",
 ]
@@ -2842,13 +2848,13 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.29.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
 dependencies = [
  "bitflags 2.5.0",
  "cfg-if",
- "cfg_aliases 0.2.1",
+ "cfg_aliases",
  "libc",
 ]
 
@@ -3013,7 +3019,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.3",
+ "hermit-abi 0.3.9",
  "libc",
 ]
 
@@ -3098,7 +3104,7 @@ dependencies = [
  "serde_with",
  "slog",
  "slog-error-chain",
- "strum",
+ "strum 0.26.1",
  "thiserror",
  "tokio",
  "uuid",
@@ -3263,9 +3269,9 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry"
-version = "0.24.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c365a63eec4f55b7efeceb724f1336f26a9cf3427b70e59e2cd2a5b947fba96"
+checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -3273,6 +3279,7 @@ dependencies = [
  "once_cell",
  "pin-project-lite",
  "thiserror",
+ "urlencoding",
 ]
 
 [[package]]
@@ -3382,7 +3389,7 @@ dependencies = [
  "serde",
  "serde_json",
  "slog-error-chain",
- "strum",
+ "strum 0.26.1",
  "syn 2.0.71",
  "thiserror",
  "toml 0.8.19",
@@ -3488,7 +3495,7 @@ dependencies = [
  "quote",
  "regex",
  "regex-syntax",
- "structmeta",
+ "structmeta 0.3.0",
  "syn 2.0.71",
 ]
 
@@ -4049,9 +4056,9 @@ dependencies = [
 
 [[package]]
 name = "reedline"
-version = "0.33.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f8c676a3f3814a23c6a0fc9dff6b6c35b2e04df8134aae6f3929cc34de21a53"
+checksum = "413a9fa6a5d8c937d3ae1e975bfb6a918bb0b6cdfae6a10416218c837a31b8fc"
 dependencies = [
  "chrono",
  "crossterm",
@@ -4060,8 +4067,8 @@ dependencies = [
  "nu-ansi-term 0.50.0",
  "serde",
  "strip-ansi-escapes",
- "strum",
- "strum_macros 0.26.1",
+ "strum 0.25.0",
+ "strum_macros 0.25.3",
  "thiserror",
  "unicode-segmentation",
  "unicode-width",
@@ -4753,7 +4760,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
 dependencies = [
  "libc",
- "mio",
+ "mio 0.8.9",
  "signal-hook",
 ]
 
@@ -5002,6 +5009,18 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
 
+[[package]]
+name = "structmeta"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ad9e09554f0456d67a69c1584c9798ba733a5b50349a6c0d0948710523922d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "structmeta-derive 0.2.0",
+ "syn 2.0.71",
+]
+
 [[package]]
 name = "structmeta"
 version = "0.3.0"
@@ -5010,7 +5029,18 @@ checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329"
 dependencies = [
  "proc-macro2",
  "quote",
- "structmeta-derive",
+ "structmeta-derive 0.3.0",
+ "syn 2.0.71",
+]
+
+[[package]]
+name = "structmeta-derive"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00"
+dependencies = [
+ "proc-macro2",
+ "quote",
  "syn 2.0.71",
 ]
 
@@ -5025,6 +5055,12 @@ dependencies = [
  "syn 2.0.71",
 ]
 
+[[package]]
+name = "strum"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
+
 [[package]]
 name = "strum"
 version = "0.26.1"
@@ -5209,13 +5245,13 @@ dependencies = [
 
 [[package]]
 name = "test-strategy"
-version = "0.4.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bf41af45e3f54cc184831d629d41d5b2bda8297e29c81add7ae4f362ed5e01b"
+checksum = "b8361c808554228ad09bfed70f5c823caf8a3450b6881cc3a38eb57e8c08c1d9"
 dependencies = [
  "proc-macro2",
  "quote",
- "structmeta",
+ "structmeta 0.2.0",
  "syn 2.0.71",
 ]
 
@@ -5331,28 +5367,27 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.38.1"
+version = "1.39.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df"
+checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
- "mio",
- "num_cpus",
+ "mio 1.0.2",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index a42700b2f..35e39bb24 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,7 +33,7 @@ resolver = "2"
 aes-gcm-siv = "0.11.1"
 anyhow = "1"
 async-recursion = "1.1.1"
-async-trait = "0.1.81"
+async-trait = "0.1.80"
 atty = "0.2.14"
 base64 = "0.22.1"
 bincode = "1.3"
@@ -60,22 +60,22 @@ hyper-staticfile = "0.9.6"
 indicatif = { version = "0.17.8", features = ["rayon"] }
 itertools = "0.12.1"
 libc = "0.2"
-mime_guess = "2.0.5"
+mime_guess = "2.0.4"
 nbd = "0.3.1"
-nix = { version = "0.29", features = [ "feature", "uio" ] }
+nix = { version = "0.28", features = [ "feature", "uio" ] }
 num_enum = "0.7"
 num-derive = "0.4"
 num-traits = "0.2"
 omicron-zone-package = "0.11.0"
 openapiv3 = "2.0.0"
-opentelemetry = "0.24.0"
+opentelemetry = "0.22.0"
 opentelemetry-jaeger = { version = "0.20.0" }
 percent-encoding = "2.3"
-proptest = "1.5.0"
+proptest = "1.4.0"
 rayon = "1.9.0"
 rand = { version = "0.8.5", features = ["min_const_gen", "small_rng"] }
 rand_chacha = "0.3.1"
-reedline = "0.33.0"
+reedline = "0.30.0"
 reqwest = { version = "0.11", features = ["default", "blocking", "json", "stream"] }
 ringbuffer = "0.15.0"
 rusqlite = { version = "0.31" }
@@ -97,7 +97,7 @@ subprocess = "0.2.9"
 strum = "0.26"
 strum_macros = "0.26"
 tempfile = "3"
-test-strategy = "0.4.0"
+test-strategy = "0.3.1"
 thiserror = "1"
 tokio = { version = "1.36", features = ["full"] }
 tokio-rustls = { version = "0.24.1" }