From 29e0f9a94913f31844fc26d6aead0f0c1e862d49 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Wed, 23 Sep 2026 16:08:18 -0700 Subject: [PATCH] fix(relay): adapt released_cli test to usage-rs 6.11.1 usage-rs 6.11.1 moved FlagMeta's env_fallback and deprecated_env into FlagMeta::extra, breaking the relay's released_cli test once release-plz's dependency update pulled the patch in (#3945). Read them from extra and require 6.11.1 so the lockfile can't resolve an older layout. Co-Authored-By: Claude Opus 5.5 --- Cargo.lock | 20 ++++++++++---------- Cargo.toml | 2 +- rs/moq-relay/tests/released_cli.rs | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5754bf2a982..e5410278e98 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9415,21 +9415,21 @@ dependencies = [ [[package]] name = "usage-argv" -version = "6.11.0" +version = "6.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e110b955e659550764e492124a3384b6b2c622a967e263f98674b37cbc6e9366" +checksum = "669a2fcdc2d909c0858fcf190d6135dd9fb303da3497f1b9fea8592bb414d74c" [[package]] name = "usage-config" -version = "6.11.0" +version = "6.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a718a143e0d5226321b63128b76eb8af658d40131f9c9be93f5d72a546acc8b3" +checksum = "7bf47002e31d27e4cad2326006ff50b88e726b6e8601f3a47cb2c2a3f4eb1357" [[package]] name = "usage-derive" -version = "6.11.0" +version = "6.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cd4e6e833bd1f8765ac31bcd51c3d35caacc717a1a7831500f06db8b8d0270" +checksum = "fba1fef6ebefcad2733a1120567baf665b67b85382539de4b6187dd85b5eab12" dependencies = [ "proc-macro2", "quote", @@ -9438,9 +9438,9 @@ dependencies = [ [[package]] name = "usage-rs" -version = "6.11.0" +version = "6.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9780b341820a3ce0769e4de8c1ff476640512c45a76b02c66a5129190c3305af" +checksum = "3ba4af226b5e8186231f5fc83dc913522fab3b5accc7fc3811e940794d522407" dependencies = [ "usage-argv", "usage-config", @@ -9450,9 +9450,9 @@ dependencies = [ [[package]] name = "usage-test" -version = "6.11.0" +version = "6.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e50b16d958911cd262f596aced44f7c0594f2d67548da8a432ec7b400fd1ebd6" +checksum = "af670ae025049d131b1d16600e80fd6794cd83e69a3c84cb6605cdb8176f4957" dependencies = [ "usage-argv", ] diff --git a/Cargo.toml b/Cargo.toml index b20e2b3b491..596b23e3eb4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -228,7 +228,7 @@ tracing-test = "0.2" # package owns the `cli` feature, moq-ffi the rest. uniffi = "0.32" url = "2" -usage = { package = "usage-rs", version = "6.3.0" } +usage = { package = "usage-rs", version = "6.11.1" } uuid = { version = "1.26", features = ["v7"] } web-async = { version = "0.1.5", features = ["tracing"] } web-transport-iroh = "0.7" diff --git a/rs/moq-relay/tests/released_cli.rs b/rs/moq-relay/tests/released_cli.rs index 2ce58eeaf47..b89a8eeeb22 100644 --- a/rs/moq-relay/tests/released_cli.rs +++ b/rs/moq-relay/tests/released_cli.rs @@ -135,8 +135,8 @@ fn envs(cmd: &usage::argv::spec::CommandMeta<'_>) -> HashMap { for env in flag .env .into_iter() - .chain(flag.env_fallback.iter().copied()) - .chain(flag.deprecated_env.iter().copied()) + .chain(flag.extra.env_fallback.iter().copied()) + .chain(flag.extra.deprecated_env.iter().copied()) { out.insert(env.to_string(), name.to_string()); }