merge main into branch

.config/nextest.toml

@@ -17,7 +17,9 @@ setup = 'crdb-seed'
 fail-fast = false
 
 [script.crdb-seed]
-command = 'cargo run -p crdb-seed'
+# Use the test profile for this executable since that's how almost all
+# invocations of nextest happen.
+command = 'cargo run -p crdb-seed --profile test'
 
 # The ClickHouse cluster tests currently rely on a hard-coded set of ports for
 # the nodes in the cluster. We would like to relax this in the future, at which

Cargo.toml

@@ -91,7 +91,9 @@ default-members = [
     "dev-tools/omdb",
     "dev-tools/omicron-dev",
     "dev-tools/thing-flinger",
-    "dev-tools/xtask",
+    # Do not include xtask in the list of default members, because this causes
+    # hakari to not work as well and build times to be longer.
+    # See omicron#4392.
     "dns-server",
     "gateway-cli",
     "gateway-test-utils",
@@ -366,7 +368,7 @@ tofino = { git = "http://github.com/oxidecomputer/tofino", branch = "main" }
 tokio = "1.34.0"
 tokio-postgres = { version = "0.7", features = [ "with-chrono-0_4", "with-uuid-1" ] }
 tokio-stream = "0.1.14"
-tokio-tungstenite = "0.18"
+tokio-tungstenite = "0.20"
 tokio-util = { version = "0.7.10", features = ["io", "io-util"] }
 toml = "0.8.8"
 toml_edit = "0.21.0"
@@ -391,13 +393,27 @@ zeroize = { version = "1.6.0", features = ["zeroize_derive", "std"] }
 zip = { version = "0.6.6", default-features = false, features = ["deflate","bzip2"] }
 zone = { version = "0.3", default-features = false, features = ["async"] }
 
+# NOTE: The test profile inherits from the dev profile, so settings under
+# profile.dev get inherited. AVOID setting anything under profile.test: that
+# will cause dev and test builds to diverge, which will cause more Cargo build
+# cache misses.
+
 [profile.dev]
-panic = "abort"
+# Note: This used to be panic = "abort" earlier, but that caused a lot of
+# duplicate dependency builds. Letting panic be "unwind" causes dependencies
+# across `cargo test` and `cargo run` to be unified. See omicron#4392.
+panic = "unwind"
+
 # See https://github.com/oxidecomputer/omicron/issues/4009 for some background context here.
 # By reducing the debug level (though keeping enough to have meaningful
 # backtraces), we reduce incremental build time and binary size significantly.
 debug = "line-tables-only"
 
+[profile.dev.build-override]
+# Setting this to line-tables-only results in a large improvement in build
+# times, because it allows target and host dependencies to be unified.
+debug = "line-tables-only"
+
 # `bindgen` is used by `samael`'s build script; building it with optimizations
 # makes that build script run ~5x faster, more than offsetting the additional
 # build time added to `bindgen` itself.
@@ -428,112 +444,108 @@ panic = "abort"
 # proptest based test generation and shrinking is expensive. Let's optimize it.
 [profile.dev.package.proptest]
 opt-level = 3
-[profile.test.package.proptest]
-opt-level = 3
 
 [profile.dev.package.bootstore]
 opt-level = 3
-[profile.test.package.bootstore]
-opt-level = 3
 
 # Crypto stuff always needs optimizations
-[profile.test.package.sha3]
+[profile.dev.package.sha3]
 opt-level = 3
-[profile.test.package.sha2]
+[profile.dev.package.sha2]
 opt-level = 3
-[profile.test.package.hkdf]
+[profile.dev.package.hkdf]
 opt-level = 3
-[profile.test.package.chacha20poly1305]
+[profile.dev.package.chacha20poly1305]
 opt-level = 3
-[profile.test.package.chacha20]
+[profile.dev.package.chacha20]
 opt-level = 3
-[profile.test.package.vsss-rs]
+[profile.dev.package.vsss-rs]
 opt-level = 3
-[profile.test.package.curve25519-dalek]
+[profile.dev.package.curve25519-dalek]
 opt-level = 3
-[profile.test.package.aead]
+[profile.dev.package.aead]
 opt-level = 3
-[profile.test.package.aes]
+[profile.dev.package.aes]
 opt-level = 3
-[profile.test.package.aes-gcm]
+[profile.dev.package.aes-gcm]
 opt-level = 3
-[profile.test.package.bcrypt-pbkdf]
+[profile.dev.package.bcrypt-pbkdf]
 opt-level = 3
-[profile.test.package.blake2]
+[profile.dev.package.blake2]
 opt-level = 3
-[profile.test.package.blake2b_simd]
+[profile.dev.package.blake2b_simd]
 opt-level = 3
-[profile.test.package.block-buffer]
+[profile.dev.package.block-buffer]
 opt-level = 3
-[profile.test.package.block-padding]
+[profile.dev.package.block-padding]
 opt-level = 3
-[profile.test.package.blowfish]
+[profile.dev.package.blowfish]
 opt-level = 3
-[profile.test.package.constant_time_eq]
+[profile.dev.package.constant_time_eq]
 opt-level = 3
-[profile.test.package.crypto-bigint]
+[profile.dev.package.crypto-bigint]
 opt-level = 3
-[profile.test.package.crypto-common]
+[profile.dev.package.crypto-common]
 opt-level = 3
-[profile.test.package.ctr]
+[profile.dev.package.ctr]
 opt-level = 3
-[profile.test.package.cbc]
+[profile.dev.package.cbc]
 opt-level = 3
-[profile.test.package.digest]
+[profile.dev.package.digest]
 opt-level = 3
-[profile.test.package.ed25519]
+[profile.dev.package.ed25519]
 opt-level = 3
-[profile.test.package.ed25519-dalek]
+[profile.dev.package.ed25519-dalek]
 opt-level = 3
-[profile.test.package.elliptic-curve]
+[profile.dev.package.elliptic-curve]
 opt-level = 3
-[profile.test.package.generic-array]
+[profile.dev.package.generic-array]
 opt-level = 3
-[profile.test.package.getrandom]
+[profile.dev.package.getrandom]
 opt-level = 3
-[profile.test.package.hmac]
+[profile.dev.package.hmac]
 opt-level = 3
-[profile.test.package.lpc55_sign]
+[profile.dev.package.lpc55_sign]
 opt-level = 3
-[profile.test.package.md5]
+[profile.dev.package.md5]
 opt-level = 3
-[profile.test.package.md-5]
+[profile.dev.package.md-5]
 opt-level = 3
-[profile.test.package.num-bigint]
+[profile.dev.package.num-bigint]
 opt-level = 3
-[profile.test.package.num-bigint-dig]
+[profile.dev.package.num-bigint-dig]
 opt-level = 3
-[profile.test.package.rand]
+[profile.dev.package.rand]
 opt-level = 3
-[profile.test.package.rand_chacha]
+[profile.dev.package.rand_chacha]
 opt-level = 3
-[profile.test.package.rand_core]
+[profile.dev.package.rand_core]
 opt-level = 3
-[profile.test.package.rand_hc]
+[profile.dev.package.rand_hc]
 opt-level = 3
-[profile.test.package.rand_xorshift]
+[profile.dev.package.rand_xorshift]
 opt-level = 3
-[profile.test.package.rsa]
+[profile.dev.package.rsa]
 opt-level = 3
-[profile.test.package.salty]
+[profile.dev.package.salty]
 opt-level = 3
-[profile.test.package.signature]
+[profile.dev.package.signature]
 opt-level = 3
-[profile.test.package.subtle]
+[profile.dev.package.subtle]
 opt-level = 3
-[profile.test.package.tiny-keccak]
+[profile.dev.package.tiny-keccak]
 opt-level = 3
-[profile.test.package.uuid]
+[profile.dev.package.uuid]
 opt-level = 3
-[profile.test.package.cipher]
+[profile.dev.package.cipher]
 opt-level = 3
-[profile.test.package.cpufeatures]
+[profile.dev.package.cpufeatures]
 opt-level = 3
-[profile.test.package.poly1305]
+[profile.dev.package.poly1305]
 opt-level = 3
-[profile.test.package.inout]
+[profile.dev.package.inout]
 opt-level = 3
-[profile.test.package.keccak]
+[profile.dev.package.keccak]
 opt-level = 3
 
 #

dev-tools/omdb/Cargo.toml

@@ -37,6 +37,7 @@ strum.workspace = true
 tabled.workspace = true
 textwrap.workspace = true
 tokio = { workspace = true, features = [ "full" ] }
+unicode-width.workspace = true
 uuid.workspace = true
 ipnetwork.workspace = true
 omicron-workspace-hack.workspace = true