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

Crate upgrades, fix ahash #6324

Merged
merged 3 commits into from
Dec 30, 2023
Merged

Crate upgrades, fix ahash #6324

merged 3 commits into from
Dec 30, 2023

Conversation

Anton-4
Copy link
Collaborator

@Anton-4 Anton-4 commented Dec 30, 2023

ahash compilation is broken on macos aarch64.
This PR makes us use ahash 0.8.6 and also does some other crate upgrades.

cli_run::static_site_gen was hitting 'use of unstable library feature stdsimd' when compiling ahash. ahash was a dependency of hashbrown 0.13.2.
@Anton-4 Anton-4 changed the title Crate upgrades, specify ahash version Crate upgrades, fix ahash Dec 30, 2023
hashbrown = { version = "0.13.2", features = ["bumpalo"] }
hashbrown = { version = "0.14.3" }
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

We were not using the bumpalo feature.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I also thought at first that hashbrown 0.14.3 was no longer using ahash but I was wrong.

@@ -30,9 +30,6 @@ pub type SendMap<K, V> = im::hashmap::HashMap<K, V, BuildHasher>;

pub type SendSet<K> = im::hashset::HashSet<K, BuildHasher>;

// pub type BumpMap<'a, K, V> = hashbrown::HashMap<K, V, BuildHasher, hashbrown::BumpWrapper<'a>>;
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The newest hashbrown no longer supports BumpWrapper, so uncommenting this code would not work anymore.

@Anton-4 Anton-4 merged commit 901e771 into main Dec 30, 2023
17 checks passed
@Anton-4 Anton-4 deleted the crate-upgrades branch December 30, 2023 19:52
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.

2 participants