Merge branch 'main' into dependabot/cargo/toml-0.7.8

Cargo.toml

@@ -8,7 +8,9 @@ members = [
     "common",
     "ddm-admin-client",
     "deploy",
-    "dev-tools",
+    "dev-tools/omdb",
+    "dev-tools/omicron-dev",
+    "dev-tools/xtask",
     "dns-server",
     "dns-service-client",
     "dpd-client",
@@ -37,7 +39,6 @@ members = [
     "nexus/test-utils-macros",
     "nexus/test-utils",
     "nexus/types",
-    "omdb",
     "oxide-client",
     "oximeter-client",
     "oximeter/collector",
@@ -62,7 +63,6 @@ members = [
     "wicket",
     "wicketd-client",
     "wicketd",
-    "xtask",
 ]
 
 default-members = [
@@ -74,7 +74,9 @@ default-members = [
     "ddm-admin-client",
     "dpd-client",
     "deploy",
-    "dev-tools",
+    "dev-tools/omdb",
+    "dev-tools/omicron-dev",
+    "dev-tools/xtask",
     "dns-server",
     "dns-service-client",
     "gateway",
@@ -98,7 +100,6 @@ default-members = [
     "nexus/db-queries",
     "nexus/defaults",
     "nexus/types",
-    "omdb",
     "oxide-client",
     "oximeter-client",
     "oximeter/collector",
@@ -123,7 +124,6 @@ default-members = [
     "wicket-dbg",
     "wicketd",
     "wicketd-client",
-    "xtask",
 ]
 resolver = "2"
 
@@ -154,11 +154,11 @@ chacha20poly1305 = "0.10.1"
 ciborium = "0.2.1"
 cfg-if = "1.0"
 chrono = { version = "0.4", features = [ "serde" ] }
-clap = { version = "4.4", features = ["derive", "env"] }
+clap = { version = "4.4", features = ["derive", "env", "wrap_help"] }
 cookie = "0.16"
 criterion = { version = "0.5.1", features = [ "async_tokio" ] }
 crossbeam = "0.8"
-crossterm = { version = "0.26.1", features = ["event-stream"] }
+crossterm = { version = "0.27.0", features = ["event-stream"] }
 crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "aeb69dda26c7e1a8b6eada425670cd4b83f91c07" }
 crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "aeb69dda26c7e1a8b6eada425670cd4b83f91c07" }
 crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "aeb69dda26c7e1a8b6eada425670cd4b83f91c07" }
@@ -234,7 +234,7 @@ nexus-types = { path = "nexus/types" }
 num-integer = "0.1.45"
 num = { version = "0.4.1", default-features = false, features = [ "libm" ] }
 omicron-common = { path = "common" }
-omicron-dev-tools = { path = "dev-tools" }
+omicron-dev = { path = "dev-tools/omicron-dev" }
 omicron-gateway = { path = "gateway" }
 omicron-nexus = { path = "nexus" }
 omicron-omdb = { path = "omdb" }
@@ -301,7 +301,7 @@ semver = { version = "1.0.18", features = ["std", "serde"] }
 serde = { version = "1.0", default-features = false, features = [ "derive" ] }
 serde_derive = "1.0"
 serde_human_bytes = { git = "http://github.com/oxidecomputer/serde_human_bytes", branch = "main" }
-serde_json = "1.0.106"
+serde_json = "1.0.107"
 serde_path_to_error = "0.1.14"
 serde_tokenstream = "0.2"
 serde_urlencoded = "0.7.1"
@@ -359,7 +359,7 @@ trust-dns-client = "0.22"
 trust-dns-proto = "0.22"
 trust-dns-resolver = "0.22"
 trust-dns-server = "0.22"
-trybuild = "1.0.84"
+trybuild = "1.0.85"
 tufaceous = { path = "tufaceous" }
 tufaceous-lib = { path = "tufaceous-lib" }
 unicode-width = "0.1.10"