Skip to content

Commit

Permalink
Merge #303
Browse files Browse the repository at this point in the history
303: Bump parking_lot packages r=jonas-schievink a=eliascodes

This is motivated by recent changes to `parking_lot` affecting `wasm32-unknown-unknown` targets (see Amanieu/parking_lot#269 if interested). My project depends on `parking_lot` via `salsa`, which is why I'm facing this issue.

TLDR is that `parking_lot` released a new version that provides a fix for the above. I'm hoping that version can be included in a future version of `salsa`.

For reference, here's the relevant part of the changelog: https://github.com/Amanieu/parking_lot/blob/HEAD/CHANGELOG.md#parking_lot-0120-parking_lot_core-090-lock_api-046-2022-01-28

I belive the only changes that might affect APIs used by `salsa` are in PRs Amanieu/parking_lot#313 and https://github.com/Amanieu/parking_lot/pull/344/files, but I'm unfamiliar with the internals of either project so could easily be wrong.

I can build and test successfully locally with these bumps. Let me know if there's anything else I can do to help this over the line.


Co-authored-by: Elias Malik <elias0789@gmail.com>
  • Loading branch information
bors[bot] and eliascodes committed Jul 6, 2022
2 parents cf22135 + 81b7984 commit 754eea8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Expand Up @@ -13,9 +13,9 @@ crossbeam-utils = { version = "0.8", default-features = false }
dashmap = "4.0.2"
hashlink = "0.7.0"
indexmap = "1.0.1"
lock_api = "0.4"
lock_api = "0.4.7"
log = "0.4.5"
parking_lot = "0.11.0"
parking_lot = "0.12.1"
rustc-hash = "1.0"
smallvec = "1.0.0"
oorandom = "11"
Expand Down

0 comments on commit 754eea8

Please sign in to comment.