Skip to content

Conversation

@torokati44
Copy link
Contributor

Like #8374, but for the 26 series.

Very similar merge conflict situation - tired to make those diffs look as similar to the originals as possible when resolving.

@torokati44 torokati44 requested review from a team and crowlKats as code owners October 18, 2025 19:12
@ErichDonGubler
Copy link
Member

ErichDonGubler commented Oct 20, 2025

This needs to cherry-pick a few things:

  1. 83a0722 and its supporting infra changes, so the fails-if directives added by tests here can parse correctly.
  2. For the cargo-deny checks, there's other stuff to backport. I think we can just ignore these, since downstream crates already need to handle this in v26.
  3. For the MSRV, there may be something to backport, but I'm not sure. I'm not familiar with this arbitrary's interaction with MSRV over its releases. Maybe @bushrat011899 or @cwfitzgerald knows?

I've pushed 9f40cd9 to the backport-pr7721-to-v26 in my erichdongubler-mozilla fork. Feel free to adopt it and force-push here. This takes care of (1) and (2), but I don't have bandwidth to figure out (3). Good luck! 🫡

@torokati44 torokati44 force-pushed the backport-pr7721-to-v26 branch from 23102ba to 9f40cd9 Compare October 21, 2025 09:45
@torokati44
Copy link
Contributor Author

@ErichDonGubler

Feel free to adopt it and force-push here. This takes care of (1) and (2),

Thank you, done!

@torokati44
Copy link
Contributor Author

I also had to backport #8112 (cherry-pick 5762102) to fix the MSRV CI failure with half and arbitrary.
See also: https://github.com/VoidStarKat/half-rs/blob/main/CHANGELOG.md#260---2025-04-08-

@ErichDonGubler
Copy link
Member

Nice work! :shipit:

@ErichDonGubler ErichDonGubler merged commit 16fa729 into gfx-rs:v26 Oct 21, 2025
40 checks passed
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.

4 participants