Skip to content

Commit e76e6c8

Browse files
hanabi1224hanabi1224
committed
chore: use workspace.dependencies
1 parent 33deb9d commit e76e6c8

File tree

9 files changed

+134
-96
lines changed

9 files changed

+134
-96
lines changed

‎Cargo.toml‎

Lines changed: 60 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,31 @@
11
[package]
22
name = "libipld"
3-
version = "0.16.0"
4-
authors = ["David Craven <[email protected]>"]
5-
edition = "2021"
6-
license = "MIT OR Apache-2.0"
73
description = "library for dealing with ipld"
8-
repository = "https://github.com/ipld/libipld"
4+
version.workspace = true
5+
authors.workspace = true
6+
edition.workspace = true
7+
license.workspace = true
8+
repository.workspace = true
99

1010
[package.metadata.release]
1111
consolidate-commits = true
1212
shared-version = true
1313

1414
[dependencies]
15-
fnv = "1.0.7"
16-
libipld-cbor = { version = "0.16.0", path = "dag-cbor", optional = true }
17-
libipld-cbor-derive = { version = "0.16.0", path = "dag-cbor-derive", optional = true }
18-
libipld-core = { version = "0.16.0", path = "core" }
19-
libipld-json = { version = "0.16.0", path = "dag-json", optional = true }
20-
libipld-macro = { version = "0.16.0", path = "macro" }
21-
libipld-pb = { version = "0.16.0", path = "dag-pb", optional = true }
22-
log = "0.4.14"
23-
multihash = { version = "0.18.0", default-features = false, features = ["multihash-impl"] }
24-
thiserror = "1.0.25"
15+
libipld-cbor = { workspace = true, optional = true }
16+
libipld-cbor-derive = { workspace = true, optional = true }
17+
libipld-core = { workspace = true }
18+
libipld-json = { workspace = true, optional = true }
19+
libipld-macro = { workspace = true }
20+
libipld-pb = { workspace = true, optional = true }
21+
22+
multihash = { workspace = true, features = ["multihash-impl"] }
23+
thiserror = { workspace = true }
2524

2625
[dev-dependencies]
27-
async-std = { version = "1.9.0", features = ["attributes"] }
28-
criterion = "0.3.4"
29-
proptest = "1.0.0"
30-
model = "0.1.2"
26+
ahash = { workspace = true }
27+
criterion = { workspace = true }
28+
multihash = { workspace = true, features = ["blake3"] }
3129

3230
[features]
3331
default = ["dag-cbor", "dag-json", "dag-pb", "derive"]
@@ -48,6 +46,49 @@ members = [
4846
"macro",
4947
"dag-cbor-derive/examples/renamed-package",
5048
]
49+
resolver = "2"
50+
51+
[workspace.package]
52+
version = "0.16.0"
53+
authors = ["David Craven <[email protected]>"]
54+
edition = "2021"
55+
license = "MIT OR Apache-2.0"
56+
repository = "https://github.com/ipld/libipld"
57+
58+
[workspace.dependencies]
59+
libipld = { path = "." }
60+
libipld-cbor = { path = "dag-cbor" }
61+
libipld-cbor-derive = { path = "dag-cbor-derive" }
62+
libipld-core = { path = "core" }
63+
libipld-json = { path = "dag-json" }
64+
libipld-macro = { path = "macro" }
65+
libipld-pb = { path = "dag-pb" }
66+
67+
# External dependencies
68+
ahash = "0.8"
69+
anyhow = { version = "1", default-features = false }
70+
byteorder = "1"
71+
bytes = "1"
72+
cid = { version = "0.10", default-features = false, features = ["alloc"] }
73+
core2 = { version = "0.4", default-features = false, features = ["alloc"] }
74+
criterion = "0.5"
75+
hex = "0.4"
76+
multibase = { version = "0.9", default-features = false }
77+
multihash = { version = "0.18", default-features = false, features = ["alloc"] }
78+
proc-macro-crate = "1"
79+
proc-macro2 = "1"
80+
quick-protobuf = "0.8"
81+
quickcheck = "1"
82+
quote = "1"
83+
serde = { version = "1", default-features = false, features = ["alloc"] }
84+
serde_bytes = "0.11"
85+
serde_cbor = "0.11"
86+
serde_json = "1"
87+
serde_test = "1"
88+
syn = "1"
89+
synstructure = "0.12"
90+
thiserror = "2"
91+
trybuild = "1"
5192

5293
[profile.release]
5394
debug = true

‎core/Cargo.toml‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
[package]
22
name = "libipld-core"
3-
version = "0.16.0"
4-
authors = ["David Craven <[email protected]>"]
5-
edition = "2021"
6-
license = "MIT OR Apache-2.0"
73
description = "Base traits and definitions used by ipld codecs."
8-
repository = "https://github.com/ipfs-rust/rust-ipld"
4+
version.workspace = true
5+
authors.workspace = true
6+
edition.workspace = true
7+
license.workspace = true
8+
repository.workspace = true
99

1010
[features]
1111
default = ["std"]
1212
std = ["anyhow/std", "cid/std", "multibase/std", "multihash/std", "thiserror"]
13-
serde-codec = ["cid/serde-codec", "serde"]
14-
arb = ["quickcheck", "cid/arb"]
13+
serde-codec = ["cid/serde-codec", "dep:serde"]
14+
arb = ["dep:quickcheck", "cid/arb"]
1515

1616
[dependencies]
17-
anyhow = { version = "1.0.40", default-features = false }
18-
cid = { version = "0.10.0", default-features = false, features = ["alloc"] }
19-
core2 = { version = "0.4", default-features = false, features = ["alloc"] }
20-
multihash = { version = "0.18.0", default-features = false, features = ["alloc"] }
21-
22-
multibase = { version = "0.9.1", default-features = false, optional = true }
23-
serde = { version = "1.0.132", default-features = false, features = ["alloc"], optional = true }
24-
thiserror = {version = "1.0.25", optional = true }
25-
quickcheck = { version = "1.0", optional = true }
17+
anyhow = { workspace = true }
18+
cid = { workspace = true }
19+
core2 = { workspace = true }
20+
multibase = { workspace = true }
21+
multihash = { workspace = true }
22+
quickcheck = { workspace = true, optional = true }
23+
serde = { workspace = true, optional = true }
24+
thiserror = { workspace = true, optional = true }
2625

2726
[dev-dependencies]
28-
multihash = { version = "0.18.0", default-features = false, features = ["multihash-impl", "blake3"] }
29-
serde_test = "1.0.132"
30-
serde_bytes = "0.11.5"
31-
serde_json = "1.0.79"
27+
multihash = { workspace = true, features = ["multihash-impl", "blake3"] }
28+
serde_bytes = { workspace = true }
29+
serde_json = { workspace = true }
30+
serde_test = { workspace = true }

‎dag-cbor-derive/Cargo.toml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
[package]
22
name = "libipld-cbor-derive"
3-
version = "0.16.0"
4-
authors = ["David Craven <[email protected]>"]
5-
edition = "2021"
6-
license = "MIT OR Apache-2.0"
73
description = "ipld cbor codec proc macro"
8-
repository = "https://github.com/ipfs-rust/rust-ipld"
4+
version.workspace = true
5+
authors.workspace = true
6+
edition.workspace = true
7+
license.workspace = true
8+
repository.workspace = true
99

1010
[lib]
1111
proc-macro = true
1212

1313
[dependencies]
14-
proc-macro-crate = "1.1.0"
15-
proc-macro2 = "1.0.27"
16-
quote = "1.0.9"
17-
syn = "1.0.72"
18-
synstructure = "0.12.4"
14+
proc-macro-crate = { workspace = true }
15+
proc-macro2 = { workspace = true }
16+
quote = { workspace = true }
17+
syn = { workspace = true }
18+
synstructure = { workspace = true }
1919

2020
[dev-dependencies]
21-
libipld = { path = ".." }
22-
trybuild = "1.0.42"
21+
libipld = { workspace = true }
22+
trybuild = { workspace = true }

‎dag-cbor-derive/examples/renamed-package/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ publish = false
88
release = false
99

1010
[dependencies]
11-
ipld = { path = "../../../", package = "libipld"}
11+
ipld = { path = "../../../", package = "libipld" }

‎dag-cbor/Cargo.toml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
[package]
22
name = "libipld-cbor"
3-
version = "0.16.0"
4-
authors = ["David Craven <[email protected]>"]
5-
edition = "2021"
6-
license = "MIT OR Apache-2.0"
73
description = "ipld cbor codec"
8-
repository = "https://github.com/ipfs-rust/rust-ipld"
4+
version.workspace = true
5+
authors.workspace = true
6+
edition.workspace = true
7+
license.workspace = true
8+
repository.workspace = true
99

1010
[dependencies]
11-
byteorder = "1.4.3"
12-
libipld-core = { version = "0.16.0", path = "../core" }
13-
thiserror = "1.0.25"
11+
byteorder = { workspace = true }
12+
libipld-core = { workspace = true }
13+
thiserror = { workspace = true }
1414

1515
[dev-dependencies]
16-
hex = "0.4.3"
17-
libipld-macro = { path = "../macro" }
18-
multihash = "0.17.0"
19-
quickcheck = "1.0.3"
20-
serde_cbor = { version = "0.11.1", features = ["tags"] }
16+
hex = { workspace = true }
17+
libipld-macro = { workspace = true }
18+
multihash = { workspace = true }
19+
quickcheck = { workspace = true }
20+
serde_cbor = { workspace = true, features = ["tags"] }

‎dag-json/Cargo.toml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[package]
22
name = "libipld-json"
3-
version = "0.16.0"
4-
authors = ["Irakli Gozalishvili <[email protected]>"]
5-
edition = "2021"
6-
license = "MIT OR Apache-2.0"
73
description = "ipld json codec"
8-
repository = "https://github.com/ipfs-rust/rust-ipld"
4+
version.workspace = true
5+
authors.workspace = true
6+
edition.workspace = true
7+
license.workspace = true
8+
repository.workspace = true
99

1010
[dependencies]
11-
libipld-core = { version = "0.16.0", path = "../core" }
12-
multihash = "0.18.0"
13-
serde_json = { version = "1.0.64", features = ["float_roundtrip"] }
14-
serde = { version = "1.0.126", features = ["derive"] }
11+
libipld-core = { workspace = true }
12+
multihash = { workspace = true }
13+
serde = { workspace = true, features = ["derive"] }
14+
serde_json = { workspace = true, features = ["float_roundtrip"] }

‎dag-pb/Cargo.toml‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
[package]
22
name = "libipld-pb"
3-
version = "0.16.0"
4-
authors = ["David Craven <[email protected]>"]
5-
edition = "2021"
6-
license = "MIT OR Apache-2.0"
73
description = "ipld protobuf codec"
8-
repository = "https://github.com/ipfs-rust/rust-ipld"
4+
version.workspace = true
5+
authors.workspace = true
6+
edition.workspace = true
7+
license.workspace = true
8+
repository.workspace = true
99

1010
[dependencies]
11-
libipld-core = { version = "0.16.0", path = "../core" }
12-
thiserror = "1.0.25"
13-
quick-protobuf = "0.8.1"
14-
bytes = "1.3.0"
11+
bytes = { workspace = true }
12+
libipld-core = { workspace = true }
13+
quick-protobuf = { workspace = true }
1514

1615
[dev-dependencies]
17-
libipld-macro = { path = "../macro" }
18-
libipld = { path = "../" }
19-
multihash = "0.18.0"
20-
hex = "0.4.3"
16+
hex = { workspace = true }
17+
libipld = { workspace = true }
18+
multihash = { workspace = true }

‎macro/Cargo.toml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[package]
22
name = "libipld-macro"
3-
version = "0.16.0"
4-
authors = ["David Craven <[email protected]>"]
5-
edition = "2021"
6-
license = "MIT OR Apache-2.0"
73
description = "ipld macro"
8-
repository = "https://github.com/ipfs-rust/rust-ipld"
4+
version.workspace = true
5+
authors.workspace = true
6+
edition.workspace = true
7+
license.workspace = true
8+
repository.workspace = true
99

1010
[dependencies]
11-
libipld-core = { version = "0.16.0", path = "../core" }
11+
libipld-core = { workspace = true }
1212

1313
[dev-dependencies]
14-
multihash = { version = "0.18.0", features = ["blake3"] }
14+
multihash = { workspace = true, features = ["blake3"] }

‎src/block.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ mod tests {
195195
use crate::ipld::Ipld;
196196
use crate::multihash::Code;
197197
use crate::store::DefaultParams;
198-
use fnv::FnvHashSet;
198+
use ahash::HashSet;
199199

200200
type IpldBlock = Block<DefaultParams>;
201201

@@ -222,7 +222,7 @@ mod tests {
222222
let payload2 = block.decode::<IpldCodec, _>().unwrap();
223223
assert_eq!(payload, payload2);
224224

225-
let mut refs = FnvHashSet::default();
225+
let mut refs = HashSet::default();
226226
payload2.references(&mut refs);
227227
assert_eq!(refs.len(), 3);
228228
assert!(refs.contains(&b1.cid));

0 commit comments

Comments
 (0)