Repository navigation
base red: cmux-tui Cargo.lock matches #31462's fs4 dependency - #31654
lawrencecchen wants to merge 2 commits into
Conversation
#31462 added `fs4.workspace = true` to crates/cmux-tui/Cargo.toml, but its Cargo.lock change put "fs4" in the dependency list of cmux-server, not cmux-tui. Every `--locked` cargo step on feat-cmux-next at 765d3c4 fails with "cannot update the lock file cmux-tui/Cargo.lock because --locked was passed". The lock here is what `cargo metadata --manifest-path cmux-tui/Cargo.toml` writes (no hand edit): "fs4" moves from cmux-server to cmux-tui. Red at d3aaa26: cargo metadata --locked --manifest-path cmux-tui/Cargo.toml -> error: cannot update the lock file ... because --locked was passed Green on this commit: the same command exits 0.
Bugbot needs on-demand usage enabledBugbot uses usage-based billing for this team and requires on-demand usage to be enabled. A team admin can enable on-demand usage in the Cursor dashboard. |
|
cmux status (one comment, edited in place; each line is updated by the job that owns it) Review App of this head (app.zip, kept 1 day)
red: cmux-next checks (god files, concurrency, crash safety, l10n); no finished base run on 7a9e1ab to compare; do not merge until green; see lane-rules |
|
Review (subagent, correctness first): SHIP at d59b646 Checked:
|
|
Found 6 test failures on Blacksmith runners: Failures
|
![Fix with [code]smith](https://pr-comments-assets.blacksmith.sh/codesmith/fix-with-codesmith-light-3x.png)
Base red on
feat-cmux-nextat 765d3c4 (#31462): every--lockedcargo step fails with[cmux-tui] error: cannot update the lock file cmux-tui/Cargo.lock because --locked was passed.Cause
#31462 added
fs4.workspace = truetocmux-tui/crates/cmux-tui/Cargo.toml. ItsCargo.lockchange put"fs4"into the dependency list of thecmux-serverpackage (line 1527), not thecmux-tuipackage.cmux-serverdoes not depend on fs4, so Cargo must rewrite the lock.Fix
This commit is only the lock that Cargo writes (
cargo metadata --format-version 1 --manifest-path cmux-tui/Cargo.toml, resolve only, no hand edit):"fs4"moves fromcmux-servertocmux-tui. The diff is 1 line removed and 1 line added. No version or checksum changes.Verification
cargo metadata --format-version 1 --locked --manifest-path cmux-tui/Cargo.tomlgiveserror: cannot update the lock file ... because --locked was passed(exit 101).--locked --offlineexits 0.cmux-ci compile-check --app --package CmuxNext --recipe-version 2 --ref d59b646e2687a548b076ea483c6cbe9df0cd08de. The result is in a comment below.Observed / Not run
cargo metadata --lockedresults above, andprepush-gate.py(no new violations).Changelog
none
Summary by cubic
Fixes the
cmux-tuiCargo.lockso--lockedcargo steps succeed onfeat-cmux-nextafter #31462 addedfs4as a workspace dependency.#31462 added
fs4.workspace = truetocmux-tui/crates/cmux-tui/Cargo.toml, but its lock change putfs4under thecmux-serverpackage instead ofcmux-tui. Sincecmux-serverdoesn't depend onfs4, Cargo was forced to rewrite the lock, failing every--lockedstep. This commit movesfs4to the correct package; the diff is one line removed and one line added with no version or checksum changes. Verified green withcargo metadata --locked --offlineon this head.Written for commit cef3d96. Summary will update on new commits.