Skip to content

Commit 915c6fc

Browse files
committed
Auto merge of #2602 - JohnTitor:parking-lot, r=jtgeibel
Update `parking_lot` to 0.11 This makes one dependency duplication but it'll be resolved once we drop rand 0.6. log: ``` Adding cloudabi v0.1.0 Adding instant v0.1.5 Updating lock_api v0.3.4 -> v0.4.0 Updating parking_lot v0.10.2 -> v0.11.0 Updating parking_lot_core v0.7.2 -> v0.8.0 Updating r2d2 v0.8.8 -> v0.8.9 Updating scheduled-thread-pool v0.2.4 -> v0.2.5 ``` r? @jtgeibel
2 parents 4c648db + f62b2f1 commit 915c6fc

File tree

2 files changed

+30
-13
lines changed

2 files changed

+30
-13
lines changed

Cargo.lock

Lines changed: 29 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ scheduled-thread-pool = "0.2.0"
5959
derive_deref = { version = "1.0.0", git = "https://github.com/azriel91/derive_deref.git", rev = "63527ab" }
6060
reqwest = { version = "0.10", features = ["blocking", "gzip", "json"] }
6161
tempfile = "3"
62-
parking_lot = "0.10"
62+
parking_lot = "0.11"
6363
jemallocator = { version = "0.3", features = ['unprefixed_malloc_on_supported_platforms', 'profiling'] }
6464

6565
lettre = "0.9"

0 commit comments

Comments
 (0)