Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
Update parking_lot to 0.7 (#10050)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tomaka @niklasad1
tomaka authored and niklasad1 committed Dec 16, 2018
1 parent 1c40eb9 commit 5ae33c9
Show file tree
Hide file tree
Showing 27 changed files with 142 additions and 53 deletions.
143 changes: 116 additions & 27 deletions Cargo.lock
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ number_prefix = "0.2"
rpassword = "1.0"
semver = "0.9"
ansi_term = "0.10"
parking_lot = "0.6"
parking_lot = "0.7"
regex = "1.0"
atty = "0.2.8"
toml = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion ethash/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ethereum-types = "0.4"
keccak-hash = "0.1"
log = "0.4"
memmap = "0.6"
parking_lot = "0.6"
parking_lot = "0.7"
primal = "0.2.3"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion ethcore/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ lru-cache = "0.1"
num = { version = "0.1", default-features = false, features = ["bigint"] }
num_cpus = "1.2"
parity-machine = { path = "../machine" }
parking_lot = "0.6"
parking_lot = "0.7"
rayon = "1.0"
rand = "0.4"
rlp = { version = "0.3.0", features = ["ethereum"] }
Expand Down
2 changes: 1 addition & 1 deletion ethcore/evm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ lazy_static = "1.0"
log = "0.4"
vm = { path = "../vm" }
keccak-hash = "0.1"
parking_lot = "0.6"
parking_lot = "0.7"
memory-cache = { path = "../../util/memory_cache" }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion ethcore/light/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ itertools = "0.5"
bincode = "0.8.0"
serde = "1.0"
serde_derive = "1.0"
parking_lot = "0.6"
parking_lot = "0.7"
stats = { path = "../../util/stats" }
keccak-hash = "0.1"
keccak-hasher = { path = "../../util/keccak-hasher" }
Expand Down
2 changes: 1 addition & 1 deletion ethcore/node_filter/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ethcore-network = { path = "../../util/network" }
ethcore-network-devp2p = { path = "../../util/network-devp2p" }
ethereum-types = "0.4"
log = "0.4"
parking_lot = "0.6"
parking_lot = "0.7"
ethabi = "6.0"
ethabi-derive = "6.0"
ethabi-contract = "6.0"
Expand Down
2 changes: 1 addition & 1 deletion ethcore/private-tx/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ futures = "0.1"
heapsize = "0.4"
keccak-hash = "0.1.2"
log = "0.4"
parking_lot = "0.6"
parking_lot = "0.7"
patricia-trie = "0.3.0"
patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
rand = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion ethcore/stratum/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "pa
jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-2.2" }
jsonrpc-tcp-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-2.2" }
log = "0.4"
parking_lot = "0.6"
parking_lot = "0.7"

[dev-dependencies]
env_logger = "0.5"
Expand Down
2 changes: 1 addition & 1 deletion ethcore/sync/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ log = "0.4"
env_logger = "0.5"
rand = "0.4"
heapsize = "0.4"
parking_lot = "0.6"
parking_lot = "0.7"
trace-time = "0.1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion ethstore/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ rustc-hex = "1.0"
tiny-keccak = "1.4"
time = "0.1.34"
itertools = "0.5"
parking_lot = "0.6"
parking_lot = "0.7"
parity-crypto = "0.2"
ethereum-types = "0.4"
dir = { path = "../util/dir" }
Expand Down
2 changes: 1 addition & 1 deletion ethstore/cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ num_cpus = "1.6"
rustc-hex = "1.0"
serde = "1.0"
serde_derive = "1.0"
parking_lot = "0.6"
parking_lot = "0.7"
ethstore = { path = "../" }
dir = { path = '../../util/dir' }
panic_hook = { path = "../../util/panic_hook" }
Expand Down
2 changes: 1 addition & 1 deletion hash-fetch/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ ethabi-derive = "6.0"
ethabi-contract = "6.0"

[dev-dependencies]
parking_lot = "0.6"
parking_lot = "0.7"
fake-fetch = { path = "../util/fake-fetch" }
2 changes: 1 addition & 1 deletion hw/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = ["Parity Technologies <[email protected]>"]

[dependencies]
log = "0.4"
parking_lot = "0.6"
parking_lot = "0.7"
protobuf = "1.4"
hidapi = { git = "https://github.com/paritytech/hidapi-rs" }
libusb = { git = "https://github.com/paritytech/libusb-rs" }
Expand Down
2 changes: 1 addition & 1 deletion logger/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ atty = "0.2"
lazy_static = "1.0"
regex = "1.0"
time = "0.1"
parking_lot = "0.6"
parking_lot = "0.7"
arrayvec = "0.4"
ansi_term = "0.10"
2 changes: 1 addition & 1 deletion miner/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ heapsize = "0.4"
keccak-hash = "0.1"
linked-hash-map = "0.5"
log = "0.4"
parking_lot = "0.6"
parking_lot = "0.7"
price-info = { path = "../price-info", optional = true }
rlp = { version = "0.3.0", features = ["ethereum"] }
trace-time = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion price-info/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ log = "0.4"
serde_json = "1.0"

[dev-dependencies]
parking_lot = "0.6"
parking_lot = "0.7"
fake-fetch = { path = "../util/fake-fetch" }
2 changes: 1 addition & 1 deletion rpc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ futures = "0.1.6"
log = "0.4"
multihash = "0.8"
order-stat = "0.1"
parking_lot = "0.6"
parking_lot = "0.7"
rand = "0.4"
rustc-hex = "1.0"
semver = "0.9"
Expand Down
2 changes: 1 addition & 1 deletion rpc_client/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ serde = "1.0"
serde_json = "1.0"
url = "1.2.0"
matches = "0.1"
parking_lot = "0.6"
parking_lot = "0.7"
jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-2.2" }
jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-2.2" }
parity-rpc = { path = "../rpc" }
Expand Down
2 changes: 1 addition & 1 deletion secret_store/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = ["Parity Technologies <[email protected]>"]
[dependencies]
byteorder = "1.0"
log = "0.4"
parking_lot = "0.6"
parking_lot = "0.7"
hyper = { version = "0.12", default-features = false }
serde = "1.0"
serde_json = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion updater/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ethcore = { path = "../ethcore" }
parity-bytes = "0.1"
ethcore-sync = { path = "../ethcore/sync" }
ethereum-types = "0.4"
parking_lot = "0.6"
parking_lot = "0.7"
parity-hash-fetch = { path = "../hash-fetch" }
parity-version = { path = "../util/version" }
parity-path = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion util/blooms-db/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = ["Parity Technologies <[email protected]>"]
[dependencies]
byteorder = "1.2"
ethbloom = "0.5"
parking_lot = "0.6"
parking_lot = "0.7"
tiny-keccak = "1.4"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion util/io/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ authors = ["Parity Technologies <[email protected]>"]
fnv = "1.0"
mio = { version = "0.6.8", optional = true }
crossbeam-deque = "0.6"
parking_lot = "0.6"
parking_lot = "0.7"
log = "0.4"
slab = "0.4"
num_cpus = "1.8"
Expand Down
2 changes: 1 addition & 1 deletion util/journaldb/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ keccak-hasher = { path = "../keccak-hasher" }
kvdb = "0.1"
log = "0.4"
memorydb = "0.3.0"
parking_lot = "0.6"
parking_lot = "0.7"
fastmap = { path = "../../util/fastmap" }
rlp = { version = "0.3.0", features = ["ethereum"] }

Expand Down
2 changes: 1 addition & 1 deletion util/len-caching-mutex/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ version = "0.1.0"
authors = ["Parity Technologies <[email protected]>"]

[dependencies]
parking_lot = "0.6"
parking_lot = "0.7"
2 changes: 1 addition & 1 deletion util/network-devp2p/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ rust-crypto = "0.2.34"
slab = "0.2"
igd = "0.7"
libc = "0.2.7"
parking_lot = "0.6"
parking_lot = "0.7"
ansi_term = "0.10"
rustc-hex = "1.0"
ethcore-io = { path = "../io", features = ["mio"] }
Expand Down
2 changes: 1 addition & 1 deletion whisper/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ hex = "0.2"
log = "0.4"
mem = { path = "../util/mem" }
ordered-float = "0.5"
parking_lot = "0.6"
parking_lot = "0.7"
rand = "0.4"
rlp = { version = "0.3.0", features = ["ethereum"] }
serde = "1.0"
Expand Down

0 comments on commit 5ae33c9

Please sign in to comment.