Skip to content

Commit

Permalink
third party: Upgrade rustc_hash
Browse files Browse the repository at this point in the history
Summary:
To 2.1

Unfortunately, I can't remove the old version of the crate. The problem is that it appears in the [public API](https://docs.rs/tiktoken-rs/latest/tiktoken_rs/struct.CoreBPE.html#method.new) of `tiktoken_rs`, which we also import. That crate has a PR to upgrade its dependency [here](zurawiki/tiktoken-rs#95) but that has not been merged. Alternatives here are:

 1. Fork `tiktoken_rs`. This seems worse.
 2. It's strictly speaking possible to use generics combined with some other tricks to avoid needing to name v1 of `FxHashMap` in fbsource. However, that makes that code extraordinarily hard to change and work with, and doesn't seem all that clearly motivated.

If there's something else I should be doing here, all ears

Reviewed By: zertosh

Differential Revision: D68064854

fbshipit-source-id: bd1c96abbc0ebaa178a55826bc85c61eb35e8301
  • Loading branch information
JakobDegen authored and facebook-github-bot committed Jan 13, 2025
1 parent cb499ed commit 74d252a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ocamlrep/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ bstr = { version = "1.10.0", features = ["serde", "std", "unicode"] }
bumpalo = { version = "3.14.0", features = ["collections"] }
indexmap = { version = "2.2.6", features = ["arbitrary", "rayon", "serde"] }
ocamlrep_derive = { path = "../ocamlrep_derive" }
rustc-hash = "1.1.0"
rustc-hash = "2.1.0"
serde = { version = "1.0.185", features = ["derive", "rc"] }
2 changes: 1 addition & 1 deletion shim/third-party/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ regex = "1.5.4"
relative-path = { version = "1.7.0", features = ["serde"] }
ring = "=0.17.5" # Upgrading this is possible, but a pain, so we don't want to pick up every new minor version
rusqlite = { version = "0.29.0", features = ["bundled"] }
rustc-hash = "1.1.0"
rustc-hash = "2.1.0"
rustls = "0.21.0"
rustls-native-certs = { package = "rustls-native-certs", version = "0.6.2" }
rustls-pemfile = { package = "rustls-pemfile", version = "1.0.0" }
Expand Down

0 comments on commit 74d252a

Please sign in to comment.