From 763c967746f5379bd06428388610713e66ec29d5 Mon Sep 17 00:00:00 2001 From: Niklas Adolfsson Date: Sun, 13 Dec 2020 21:27:22 +0100 Subject: [PATCH] chore(deps): cargo upgrade parking_lot --all (#470) * chore(deps): cargo upgrade parking_lot --all * chore(deps): bump versions breaking change. * chore: update changelog * kvdb * kvdb-memorydb * kvdb-rocksdb * parity-util-mem * fix nits * fix: kvdb-web add missing changelog entry * fix: bad merge * fix more nits: use breaking label * [kvdb-memorydb]: add `wasm-bindgen` feature flag * grumbles: remove `wasm-bindgen` feature flag * Add hack only in `kvdb-web` * Remove feature flag `wasm-bindgen` from `kvdb-memorydb` --- kvdb-memorydb/CHANGELOG.md | 2 ++ kvdb-memorydb/Cargo.toml | 13 ++++++++----- kvdb-rocksdb/CHANGELOG.md | 6 ++++-- kvdb-rocksdb/Cargo.toml | 10 +++++----- kvdb-shared-tests/Cargo.toml | 4 ++-- kvdb-web/CHANGELOG.md | 2 ++ kvdb-web/Cargo.toml | 14 +++++++++----- kvdb/CHANGELOG.md | 2 ++ kvdb/Cargo.toml | 4 ++-- parity-util-mem/CHANGELOG.md | 2 ++ parity-util-mem/Cargo.toml | 4 ++-- 11 files changed, 40 insertions(+), 23 deletions(-) diff --git a/kvdb-memorydb/CHANGELOG.md b/kvdb-memorydb/CHANGELOG.md index 89b2a4ed0..a74210497 100644 --- a/kvdb-memorydb/CHANGELOG.md +++ b/kvdb-memorydb/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog]. [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/ ## [Unreleased] +### Breaking +- Updated dependencies. [#470](https://github.com/paritytech/parity-common/pull/470) ## [0.7.0] - 2020-06-24 - Updated `kvdb` to 0.7. [#402](https://github.com/paritytech/parity-common/pull/402) diff --git a/kvdb-memorydb/Cargo.toml b/kvdb-memorydb/Cargo.toml index 1fc78291e..7cf540bd9 100644 --- a/kvdb-memorydb/Cargo.toml +++ b/kvdb-memorydb/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kvdb-memorydb" -version = "0.7.0" +version = "0.8.0" authors = ["Parity Technologies "] repository = "https://github.com/paritytech/parity-common" description = "A key-value in-memory database that implements the `KeyValueDB` trait" @@ -8,9 +8,12 @@ license = "MIT OR Apache-2.0" edition = "2018" [dependencies] -parity-util-mem = { path = "../parity-util-mem", version = "0.7", default-features = false, features = ["std"] } -parking_lot = "0.10.0" -kvdb = { version = "0.7", path = "../kvdb" } +parity-util-mem = { path = "../parity-util-mem", version = "0.8", default-features = false, features = ["std"] } +parking_lot = "0.11.1" +kvdb = { version = "0.8", path = "../kvdb" } [dev-dependencies] -kvdb-shared-tests = { path = "../kvdb-shared-tests", version = "0.5" } +kvdb-shared-tests = { path = "../kvdb-shared-tests", version = "0.6" } + +[features] +default = [] diff --git a/kvdb-rocksdb/CHANGELOG.md b/kvdb-rocksdb/CHANGELOG.md index acf6282fb..a2f14fcd7 100644 --- a/kvdb-rocksdb/CHANGELOG.md +++ b/kvdb-rocksdb/CHANGELOG.md @@ -5,10 +5,12 @@ The format is based on [Keep a Changelog]. [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/ ## [Unreleased] +### Breaking +- Updated dependencies. [#470](https://github.com/paritytech/parity-common/pull/470) ## [0.9.1] - 2020-08-26 - Updated rocksdb to 0.15. [#424](https://github.com/paritytech/parity-common/pull/424) -- Set `format_version` to 5. [#395](https://github.com/paritytech/parity-common/pull/395) +- Set `format_version` to 5. [#395](https://github.com/paritytech/parity-common/pull/395) ## [0.9.0] - 2020-06-24 - Updated `kvdb` to 0.7. [#402](https://github.com/paritytech/parity-common/pull/402) @@ -18,7 +20,7 @@ The format is based on [Keep a Changelog]. ### Breaking - Updated to the new `kvdb` interface. [#313](https://github.com/paritytech/parity-common/pull/313) - Rename and optimize prefix iteration. [#365](https://github.com/paritytech/parity-common/pull/365) -- Added Secondary Instance API. [#384](https://github.com/paritytech/parity-common/pull/384) +- Added Secondary Instance API. [#384](https://github.com/paritytech/parity-common/pull/384) ## [0.7.0] - 2020-03-16 - Updated dependencies. [#361](https://github.com/paritytech/parity-common/pull/361) diff --git a/kvdb-rocksdb/Cargo.toml b/kvdb-rocksdb/Cargo.toml index 3ad8b0d77..e623914d9 100644 --- a/kvdb-rocksdb/Cargo.toml +++ b/kvdb-rocksdb/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kvdb-rocksdb" -version = "0.9.1" +version = "0.10.0" authors = ["Parity Technologies "] repository = "https://github.com/paritytech/parity-common" description = "kvdb implementation backed by RocksDB" @@ -14,20 +14,20 @@ harness = false [dependencies] smallvec = "1.0.0" fs-swap = "0.2.4" -kvdb = { path = "../kvdb", version = "0.7" } +kvdb = { path = "../kvdb", version = "0.8" } log = "0.4.8" num_cpus = "1.10.1" -parking_lot = "0.10.0" +parking_lot = "0.11.1" regex = "1.3.1" rocksdb = { version = "0.15", features = ["snappy"], default-features = false } owning_ref = "0.4.0" -parity-util-mem = { path = "../parity-util-mem", version = "0.7", default-features = false, features = ["std", "smallvec"] } +parity-util-mem = { path = "../parity-util-mem", version = "0.8", default-features = false, features = ["std", "smallvec"] } [dev-dependencies] alloc_counter = "0.0.4" criterion = "0.3" ethereum-types = { path = "../ethereum-types" } -kvdb-shared-tests = { path = "../kvdb-shared-tests", version = "0.5" } +kvdb-shared-tests = { path = "../kvdb-shared-tests", version = "0.6" } rand = "0.7.2" tempfile = "3.1.0" keccak-hash = { path = "../keccak-hash" } diff --git a/kvdb-shared-tests/Cargo.toml b/kvdb-shared-tests/Cargo.toml index 4e531d5fc..14693f52d 100644 --- a/kvdb-shared-tests/Cargo.toml +++ b/kvdb-shared-tests/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "kvdb-shared-tests" -version = "0.5.0" +version = "0.6.0" authors = ["Parity Technologies "] edition = "2018" description = "Shared tests for kvdb functionality, to be executed against actual implementations" license = "MIT OR Apache-2.0" [dependencies] -kvdb = { path = "../kvdb", version = "0.7" } +kvdb = { path = "../kvdb", version = "0.8" } diff --git a/kvdb-web/CHANGELOG.md b/kvdb-web/CHANGELOG.md index 64dd9ba34..ba028010b 100644 --- a/kvdb-web/CHANGELOG.md +++ b/kvdb-web/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog]. [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/ ## [Unreleased] +### Breaking +- Updated dependencies. [#470](https://github.com/paritytech/parity-common/pull/470) ## [0.7.0] - 2020-07-06 - Updated `kvdb` to 0.7.0 [#404](https://github.com/paritytech/parity-common/pull/404) diff --git a/kvdb-web/Cargo.toml b/kvdb-web/Cargo.toml index 70080ae9a..7790262f4 100644 --- a/kvdb-web/Cargo.toml +++ b/kvdb-web/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kvdb-web" -version = "0.7.0" +version = "0.8.0" authors = ["Parity Technologies "] repository = "https://github.com/paritytech/parity-common" description = "A key-value database for use in browsers" @@ -11,12 +11,16 @@ edition = "2018" [dependencies] wasm-bindgen = "0.2.69" js-sys = "0.3.46" -kvdb = { version = "0.7", path = "../kvdb" } -kvdb-memorydb = { version = "0.7", path = "../kvdb-memorydb" } +kvdb = { version = "0.8", path = "../kvdb" } +kvdb-memorydb = { version = "0.8", path = "../kvdb-memorydb" } futures = "0.3.8" log = "0.4.11" send_wrapper = "0.5.0" -parity-util-mem = { path = "../parity-util-mem", version = "0.7", default-features = false } +parity-util-mem = { path = "../parity-util-mem", version = "0.8", default-features = false } +# TODO: https://github.com/paritytech/parity-common/issues/479 +# This is hack to enable `wasm-bindgen` feature of `parking_lot` in other dependencies. +# Thus, it's not direct dependency and do not remove until a proper fix exists. +parking_lot = { version = "0.11.1", features = ["wasm-bindgen"] } [dependencies.web-sys] version = "0.3.46" @@ -40,6 +44,6 @@ features = [ [dev-dependencies] console_log = "0.2.0" -kvdb-shared-tests = { path = "../kvdb-shared-tests", version = "0.5" } +kvdb-shared-tests = { path = "../kvdb-shared-tests", version = "0.6" } wasm-bindgen-test = "0.3.19" wasm-bindgen-futures = "0.4.19" diff --git a/kvdb/CHANGELOG.md b/kvdb/CHANGELOG.md index e67725cd7..3577a4a82 100644 --- a/kvdb/CHANGELOG.md +++ b/kvdb/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog]. [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/ ## [Unreleased] +### Breaking +- Updated `parity-util-mem` to 0.8. [#470](https://github.com/paritytech/parity-common/pull/470) ## [0.7.0] - 2020-06-24 - Updated `parity-util-mem` to 0.7. [#402](https://github.com/paritytech/parity-common/pull/402) diff --git a/kvdb/Cargo.toml b/kvdb/Cargo.toml index 1accfb38b..4cf0c7657 100644 --- a/kvdb/Cargo.toml +++ b/kvdb/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kvdb" -version = "0.7.0" +version = "0.8.0" authors = ["Parity Technologies "] repository = "https://github.com/paritytech/parity-common" description = "Generic key-value trait" @@ -9,4 +9,4 @@ edition = "2018" [dependencies] smallvec = "1.0.0" -parity-util-mem = { path = "../parity-util-mem", version = "0.7", default-features = false } +parity-util-mem = { path = "../parity-util-mem", version = "0.8", default-features = false } diff --git a/parity-util-mem/CHANGELOG.md b/parity-util-mem/CHANGELOG.md index b8dfe28f9..65d4b0860 100644 --- a/parity-util-mem/CHANGELOG.md +++ b/parity-util-mem/CHANGELOG.md @@ -6,8 +6,10 @@ The format is based on [Keep a Changelog]. ## [Unreleased] - Updated dlmalloc to 0.2.1. [#452](https://github.com/paritytech/parity-common/pull/452) + ### Breaking - Updated `ethereum-types` to 0.10. [#463](https://github.com/paritytech/parity-common/pull/463) +- Updated `parking_lot` to 0.11.1. [#470](https://github.com/paritytech/parity-common/pull/470) ## [0.7.0] - 2020-06-24 - Added `const_size` to `MallocSizeOf` to optimize it for flat collections. [#398](https://github.com/paritytech/parity-common/pull/398) diff --git a/parity-util-mem/Cargo.toml b/parity-util-mem/Cargo.toml index f2ccbfb09..09a8d1c7c 100644 --- a/parity-util-mem/Cargo.toml +++ b/parity-util-mem/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "parity-util-mem" -version = "0.7.0" +version = "0.8.0" authors = ["Parity Technologies "] repository = "https://github.com/paritytech/parity-common" description = "Collection of memory related utilities" @@ -27,7 +27,7 @@ impl-trait-for-tuples = "0.1.3" smallvec = { version = "1.0.0", optional = true } ethereum-types = { version = "0.10.0", optional = true, path = "../ethereum-types" } -parking_lot = { version = "0.10.0", optional = true } +parking_lot = { version = "0.11.1", optional = true } primitive-types = { version = "0.8", path = "../primitive-types", default-features = false, optional = true } [target.'cfg(target_os = "windows")'.dependencies]