Skip to content

Commit

Permalink
adapt workspace dependent style
Browse files Browse the repository at this point in the history
  • Loading branch information
Pana committed Jan 10, 2025
1 parent b3e86b3 commit 98b3f18
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 29 deletions.
14 changes: 13 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ diem-network-address-encryption = { path = "./crates/pos/config/management/netwo
proc-macro2 = "1.0"
quote = "1.0"
syn = "1.0"
proc-macro-crate = "3"

serde = { version = "1.0", features = [
"derive",
Expand All @@ -261,6 +262,8 @@ anyhow = "1.0"
parking_lot = "0.11"
rayon = "1.10"
threadpool = "1.7"
crossbeam-deque = "0.7"
crossbeam-channel = "0.4"

# alloy & revm
alloy-sol-types = "0.7.2"
Expand Down Expand Up @@ -308,6 +311,7 @@ tracing-futures = "0.2"
# old version tokio 0.2
tokio02 = { version = "0.2", package = "tokio", features = ["full"] }
tokio01 = { version = "0.1", package = "tokio" }
timer = "0.2" # outdated

# crypto & hash
fixed-hash = "0.5"
Expand Down Expand Up @@ -396,6 +400,13 @@ fs_extra = "1.1.0"
fs-swap = "0.2.4"
regex = "1.3.1"
cfg-if = "0.1"
unroll = "0.1.5"
atom = "0.3"
fnv = "1.0"
winapi = "0.3.7"
synstructure = "0.12"
lru-cache = "0.1"
duration-str = "0.5.1"

# conflux forked crates
rocksdb = { git = "https://github.com/Conflux-Chain/rust-rocksdb.git", rev = "3773afe5b953997188f37c39308105b5deb0faac" }
Expand Down Expand Up @@ -427,4 +438,5 @@ proptest-derive = "0.3.0"
# dbs
sqlite = "0.25"
sqlite3-sys = "0.12"
kvdb = "0.4"
kvdb = "0.4"
influx_db_client = "0.5.1"
2 changes: 1 addition & 1 deletion crates/util/cfx_math/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = "2021"
[dependencies]
num = { workspace = true }
cfx-types = { workspace = true }
unroll = "0.1.5"
unroll = { workspace = true }
typenum = { workspace = true }

[dev-dependencies]
Expand Down
12 changes: 4 additions & 8 deletions crates/util/delegate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,8 @@ repository = "https://github.com/chancancode/rust-delegate"

[lib]
proc-macro = true
[dependencies.proc-macro2]
version = "1"

[dependencies.quote]
version = "1"

[dependencies.syn]
version = "1.0.64"
features = ["full"]
[dependencies]
proc-macro2 = { workspace = true }
quote = { workspace = true }
syn = { workspace = true, features = ["full"] }
7 changes: 2 additions & 5 deletions crates/util/hibitset/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,10 @@ authors = ["csheratt"]
edition = "2021"

[dependencies]
atom = "0.3"
atom = { workspace = true }
malloc_size_of = { workspace = true }
malloc_size_of_derive = { workspace = true }

[dependencies.rayon]
version = "1"
optional = true
rayon = { workspace = true, optional = true }

[dev-dependencies]
rand = { workspace = true }
Expand Down
8 changes: 4 additions & 4 deletions crates/util/io/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ version = "0.1.0"
edition = "2021"

[dependencies]
fnv = "1.0"
fnv = { workspace = true }
mio = { workspace = true }
crossbeam-deque = "0.7"
crossbeam-channel = "0.4"
crossbeam-deque = { workspace = true }
crossbeam-channel = { workspace = true }
parking_lot = { workspace = true }
log = { workspace = true }
slab = { workspace = true }
num_cpus = { workspace = true }
timer = "0.2"
timer = { workspace = true }
time = { workspace = true }
metrics = { workspace = true }
lazy_static = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/util/malloc_size_of/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "MIT/Apache-2.0"
cfx-types = { workspace = true }
cfg-if = { workspace = true }
hashbrown = { workspace = true }
winapi = "0.3.7"
winapi = { workspace = true }
slab = { workspace = true }
parking_lot = { workspace = true }
smallvec = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/util/malloc_size_of_derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ proc-macro = true

[dependencies]
proc-macro2 = { workspace = true }
syn = { version = "1", features = ["full"] }
synstructure = "0.12"
syn = { workspace = true, features = ["full"] }
synstructure = { workspace = true }
2 changes: 1 addition & 1 deletion crates/util/memory-cache/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ edition = "2021"

[dependencies]
malloc_size_of = { workspace = true }
lru-cache = "0.1"
lru-cache = { workspace = true }
6 changes: 3 additions & 3 deletions crates/util/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ edition = "2021"
[dependencies]
lazy_static = { workspace = true }
parking_lot = { workspace = true }
timer = "0.2.0"
timer = { workspace = true }
time = { workspace = true }
rand = { workspace = true }
influx_db_client = "0.5.1"
influx_db_client = { workspace = true }
log = { workspace = true }
log4rs = { workspace = true, features = ["background_rotation", "gzip"] }
futures = { workspace = true }
tokio = { workspace = true }
chrono = { workspace = true }
serde = { workspace = true }
duration-str = "0.5.1"
duration-str = { workspace = true }

[dev-dependencies]
criterion = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/util/sha3-macro/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
syn = {version = "1", features=["parsing"]}
syn = { workspace = true, features=["parsing"]}
quote = { workspace = true }
proc-macro2 = { workspace = true }
keccak-hash = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/util/solidity-abi-derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ edition = "2021"

[dependencies]

syn = {version = "1", features=["parsing"]} # feature "extra-traits" for debug
syn = { workspace = true, features=["parsing"] } # feature "extra-traits" for debug
quote = { workspace = true }
proc-macro2 = { workspace = true }
proc-macro-crate = "3"
proc-macro-crate = { workspace = true }

[lib]
proc-macro = true

0 comments on commit 98b3f18

Please sign in to comment.