Skip to content

Conversation

andyleiserson
Copy link
Contributor

@andyleiserson andyleiserson commented Oct 17, 2025

There were some Cargo.lock inconsistencies due to changes that were tested/merged in parallel (I believe #8229 and #8263). This fixes them. It also adds --locked to CI to enforce better Cargo.lock hygiene. Note that doing so wouldn't have prevented this from happening, it just means that we would have noticed right away because the 2nd PR would have broken trunk.

Testing
Build still works in CI.

Squash or Rebase? Rebase

Checklist

  • Run cargo fmt.
  • Run taplo format.
  • Run cargo clippy --tests. If applicable, add:
    • --target wasm32-unknown-unknown
  • Run cargo xtask test to run tests.
  • If this contains user-facing changes, add a CHANGELOG.md entry.

@andyleiserson andyleiserson marked this pull request as ready for review October 17, 2025 17:13
Copy link
Member

@ErichDonGubler ErichDonGubler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM overall! One non-blocking nit.

"rustix 1.0.8",
"windows-sys 0.61.0",
"rustix 1.1.2",
"windows-sys 0.52.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: This windows-sys change seems like unnecessary churn, and dependent on what you were doing. AFAIK rustix allows windows-sys 0.61.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be a weird problem where cargo update sometimes resolves things differently on different... (platforms?) I'm not sure. I've seen this kind of thing a lot.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've seen it exclusively with windows-sys and one more windows related crate. really strange

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case, if I revert the windows-sys change, cargo --locked rejects the lockfile, so I'm going to leave the change, although it's certainly annoying.

@andyleiserson andyleiserson merged commit 01a4a6e into gfx-rs:trunk Oct 20, 2025
41 checks passed
@andyleiserson andyleiserson deleted the push-qvzpltomypol branch October 20, 2025 13:21
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.

5 participants