Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump indexmap to v2 #2426

Merged
merged 1 commit into from
Aug 11, 2023
Merged

Bump indexmap to v2 #2426

merged 1 commit into from
Aug 11, 2023

Conversation

daxpedda
Copy link
Contributor

@daxpedda daxpedda commented Aug 8, 2023

Bumps indexmap to v2.
See the changelog, I don't believe there are any relevant changes for naga.

Notably this updates hashbrown from v0.12 to v0.14 and ahash from v0.7 to v0.8.

@daxpedda
Copy link
Contributor Author

daxpedda commented Aug 8, 2023

So the minimal versions check fails because indexmap v2.0.0 -> arbitrary v1.0.0 -> derive_arbitrary v1.0.0 depends on syn v1.0.0, which it doesn't actually support. It requires at least syn v1.0.6.

derive_arbitrary v1.3.0 doesn't have this issue, as it relies on syn v1.0.56.
arbitrary v1.3.0 would require at least derive_arbitrary v1.3.0, which if indexmap depends on could fix this issue.

So either we:

  1. Make a PR to indexmap telling them to bump to arbitrary v1.3.
  2. Or we could just add a line in our CI bumping syn to v1.0.6 after generating the minimal lockfile.

Happy to apply either solution.

@ErichDonGubler
Copy link
Member

ErichDonGubler commented Aug 9, 2023 via email

@teoxoy
Copy link
Member

teoxoy commented Aug 9, 2023

Looks like it https://searchfox.org/mozilla-central/source/build/rust/indexmap

It's missing feature flags but those shouldn't be too hard to add.

@teoxoy
Copy link
Member

teoxoy commented Aug 9, 2023

@daxpedda

  1. Make a PR to indexmap telling them to bump to arbitrary v1.3.

I think this would be preferred.

fornwall added a commit to fornwall/indexmap that referenced this pull request Aug 10, 2023
@fornwall
Copy link
Contributor

Make a PR to indexmap telling them to bump to arbitrary v1.3.

Created indexmap-rs/indexmap#271

@daxpedda
Copy link
Contributor Author

As noted in indexmap-rs/indexmap#271, this was already broken on our side.
Fixed in #2429.

@teoxoy
Copy link
Member

teoxoy commented Aug 11, 2023

If you rebase, I think we should be able to merge this one now.

@teoxoy teoxoy merged commit bd74b11 into gfx-rs:master Aug 11, 2023
5 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