Skip to content

fix(relay): follow usage-rs 6.11.1 moving env aliases under FlagMeta::extra - #4006

Merged
kixelated merged 1 commit into
mainfrom
claude/usage-rs-6.11.1
Sep 23, 2026
Merged

kixelated merged 1 commit into
mainfrom
claude/usage-rs-6.11.1

Conversation

@kixelated

Copy link
Copy Markdown
Collaborator

Unblocks release-plz #3945. Its Check and Test jobs fail with:

error[E0609]: no field `env_fallback` on type `&usage_rs::spec::FlagMeta<'_>`
  --> rs/moq-relay/tests/released_cli.rs:138:16

usage-rs 6.11.1, a patch release from today, moved FlagMeta::env_fallback / deprecated_env into FlagMeta::extra (FlagExtra). The cargo update in release-plz's lockfile refresh picked it up. Main still locks 6.11.0 and only check-changed builds moq-relay's tests, so other PRs never hit it.

This PR:

  • takes 6.11.1 on main (cargo update -p usage-rs, which moves all usage-* crates to 6.11.1);
  • reads the moved fields in released_cli.rs.

Only this test reads those fields. cargo test --locked -p moq-relay --test released_cli passes (2/2).

🤖 Generated with Claude Code

(written by Opus 5.5)

…:extra

usage-rs 6.11.1 (a patch release) moved FlagMeta's env_fallback and
deprecated_env into FlagMeta::extra. release-plz's lockfile refresh in
#3945 picked it up, so released_cli.rs stopped compiling and blocked the
release. Take 6.11.1 on main and read the moved fields.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Sep 23, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-09-23T22:54:44.519189Z 0a33f41 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@kixelated
kixelated enabled auto-merge (squash) September 23, 2026 22:50

Copy link
Copy Markdown
Collaborator Author

MERGE

Positive improvement? Yes. usage-rs 6.11.1 moved env_fallback / deprecated_env under FlagMeta::extra (FlagExtra), which matches the published docs for that version. Main still locked 6.11.0, so release-plz’s lockfile refresh hit E0609 in released_cli while day-to-day PRs did not. This unblocks #3945 with the smallest possible follow-up.

Worth the complexity? Yes. Two call-site field paths plus a cargo update -p usage-rs that bumps the usage-* set to 6.11.1. This test is the only reader of those fields.

Different approach? Pinning usage-rs at 6.11.0 would keep fighting the next lockfile refresh. Following the upstream move on main is the right fix; no broader refactor is needed.

Note: Cargo.lock also rewrites data-encoding-macro-internal’s syn disambiguator (3.0.6 → 1.0.109) with an unchanged package checksum. That looks like a normal resolver side effect of the update, not a deliberate dependency change. Author reports cargo test --locked -p moq-relay --test released_cli passes (2/2); CI was still pending at review time.

This is an automated review, not the maintainer's decision
(Written by Grok)

@coderabbitai

coderabbitai Bot commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

Review in Change Stack →

Navigate logical layers of code changes, visualize relationships, and explore their blast radius.

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Advanced

Run ID: e27cf3a9-2234-4c1d-82ce-66ea013b0e27

📥 Commits

Reviewing files that changed from the base of the PR and between 2be2fed and 0a33f41.

⛔ Files ignored due to path filters (1)
  • Cargo.lock is excluded by !**/*.lock
📒 Files selected for processing (1)
  • rs/moq-relay/tests/released_cli.rs

Included review availability: Your plan provides up to 4 included reviews per hour; 0 remain after this review.


Walkthrough

The envs helper in the released CLI test now reads fallback and deprecated environment variable names from flag.extra instead of top-level fields.

Merge Risk: ⚪ Minimal · up to 0a33f

No concrete regression remains in the reviewed changes, so no identified issue blocks merging.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and concisely describes the compatibility fix for the usage-rs 6.11.1 move of environment aliases under FlagMeta::extra.
Description check ✅ Passed The description directly explains the compilation failure, dependency update, code change, and test result. It is relevant to the changeset.
Docstring Coverage ✅ Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 1 functions across 1 files.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
✨ Simplify code
  • Commit to this branch
  • Create a new PR

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@kixelated
kixelated merged commit c2f72f2 into main Sep 23, 2026
7 checks passed
@kixelated
kixelated deleted the claude/usage-rs-6.11.1 branch September 23, 2026 23:05
This was referenced Sep 23, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant