Skip to content

Commit 795762c

Browse files
authored
Avoid duplicate crates (#551)
1 parent b9eb3e4 commit 795762c

File tree

6 files changed

+58
-71
lines changed

6 files changed

+58
-71
lines changed

.github/workflows/rust.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
include:
2323
- build: pinned
2424
os: ubuntu-20.04
25-
rust: 1.65.0
25+
rust: 1.66.0
2626
- build: stable
2727
os: ubuntu-20.04
2828
rust: stable

Cargo.toml

+27
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,30 @@ members = [
77
]
88

99
exclude = ["proptest/test-persistence-location/*"]
10+
11+
[workspace.dependencies]
12+
bit-set = "0.8.0"
13+
bit-vec = "0.8.0"
14+
bitflags = "2"
15+
compiletest_rs = "0.11"
16+
convert_case = "0.6"
17+
criterion = "0.5"
18+
insta = "1"
19+
lazy_static = "1.2"
20+
message-io = "0.18.0"
21+
num-traits = { version = "0.2.15", default-features = false }
22+
prettyplease = "0.2"
23+
proc-macro2 = "1.0"
24+
proptest-macro = { version = "0.1", path = "proptest-macro" }
25+
quote = "1.0"
26+
rand = { version = "0.8", default-features = false }
27+
rand_chacha = { version = "0.3", default-features = false }
28+
rand_xorshift = "0.3"
29+
regex = "1.0"
30+
regex-syntax = "0.8"
31+
rusty-fork = { version = "0.3.0", default-features = false }
32+
syn = "2.0.48"
33+
tempfile = "3.0"
34+
trybuild = "=1.0.0"
35+
unarray = "0.1.4"
36+
x86 = "0.52.0"

proptest-derive/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ proptest = { version = "1.0.0", path = "../proptest" }
2727
# features. However, due to
2828
# https://github.com/laumann/compiletest-rs/issues/166, the default features of
2929
# compiletest-rs fail to compile, but the stable fallback works fine.
30-
compiletest_rs = { version = "0.11", features = ["tmp", "stable"] }
30+
compiletest_rs = { workspace = true, features = ["tmp", "stable"] }
3131
# criterion is used for benchmarks.
32-
criterion = "0.5"
32+
criterion = { workspace = true }
3333

3434
[dependencies]
35-
proc-macro2 = "1.0"
36-
syn = { version = "2.0.48", features = ["visit", "extra-traits", "full"] }
37-
quote = "1.0"
35+
proc-macro2 = { workspace = true }
36+
syn = { workspace = true, features = ["visit", "extra-traits", "full"] }
37+
quote = { workspace = true }
3838

3939
[features]
4040
# Don't generate TupleUnion structs in #[derive(Arbitrary)] code

proptest-macro/Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ repository = "https://github.com/proptest-rs/proptest"
99
homepage = "https://proptest-rs.github.io/proptest/proptest/index.html"
1010
keywords = ["property", "testing", "quickcheck", "fuzz", "hypothesis"]
1111
categories = ["development-tools::testing"]
12-
rust-version = "1.65"
12+
rust-version = "1.66"
1313

1414
[lib]
1515
proc-macro = true
1616

1717
[dependencies]
18-
syn = { version = "2", features = ["full"] }
19-
quote = "1"
20-
proc-macro2 = "1"
21-
convert_case = "0.6"
18+
syn = { workspace = true, features = ["full"] }
19+
quote = { workspace = true }
20+
proc-macro2 = { workspace = true }
21+
convert_case = { workspace = true }
2222

2323
[dev-dependencies]
24-
insta = "1"
25-
prettyplease = "0.2"
24+
insta = { workspace = true }
25+
prettyplease = { workspace = true }

proptest-state-machine/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ proptest = { version = "1.5.0", path = "../proptest", default-features = true, f
2727
] }
2828

2929
[dev-dependencies]
30-
message-io = "0.18.0"
30+
message-io = { workspace = true }

proptest/Cargo.toml

+17-57
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/proptest/latest/proptest/"
1010
keywords = ["property", "testing", "quickcheck", "fuzz", "hypothesis"]
1111
categories = ["development-tools::testing"]
1212
edition = "2018"
13-
rust-version = "1.65"
13+
rust-version = "1.66"
1414
exclude = ["/gen-*.sh", "/readme-*.md"]
1515

1616
description = """
@@ -63,65 +63,25 @@ bit-set = ["dep:bit-set", "dep:bit-vec"]
6363
handle-panics = ["std"]
6464

6565
[dependencies]
66-
bitflags = "2"
67-
unarray = "0.1.4"
68-
proptest-macro = { version = "0.1", path = "../proptest-macro", optional = true }
69-
70-
# [dependencies.hashmap_core]
71-
# version = "0.1.5"
72-
# optional = true
73-
74-
[dependencies.lazy_static]
75-
version = "1.2"
76-
optional = true
77-
78-
[dependencies.num-traits]
79-
version = "0.2.15"
80-
default-features = false
81-
82-
[dependencies.regex-syntax]
83-
# If you change this, make sure to also bump the `regex` dependency to a
84-
# version that also uses this version of regex-syntax.
85-
version = "0.8"
86-
optional = true
87-
88-
[dependencies.bit-set]
89-
version = "0.8.0"
90-
optional = true
91-
92-
[dependencies.bit-vec]
93-
version = "0.8.0"
94-
optional = true
95-
96-
[dependencies.rand]
97-
version = "0.8"
98-
default-features = false
99-
features = ["alloc"]
100-
101-
[dependencies.rand_xorshift]
102-
version = "0.3"
103-
104-
[dependencies.rand_chacha]
105-
version = "0.3"
106-
default-features = false
107-
108-
[dependencies.rusty-fork]
109-
version = "0.3.0"
110-
optional = true
111-
default-features = false
112-
113-
[dependencies.tempfile]
114-
version = "3.0"
115-
optional = true
116-
117-
[dependencies.x86]
118-
version = "0.52.0"
119-
optional = true
66+
bitflags = { workspace = true }
67+
unarray = { workspace = true }
68+
proptest-macro = { workspace = true, optional = true }
69+
lazy_static= { workspace = true, optional = true }
70+
num-traits= { workspace = true }
71+
regex-syntax= { workspace = true, optional = true }
72+
bit-set= { workspace = true, optional = true }
73+
bit-vec= { workspace = true, optional = true }
74+
rand= { workspace = true, features = ["alloc"] }
75+
rand_xorshift= { workspace = true }
76+
rand_chacha= { workspace = true }
77+
rusty-fork= { workspace = true, optional = true }
78+
tempfile= { workspace = true, optional = true }
79+
x86= { workspace = true, optional = true }
12080

12181
[package.metadata.docs.rs]
12282
all-features = true
12383
rustdoc-args = ["--cfg", "docsrs"]
12484

12585
[dev-dependencies]
126-
regex = "1.0"
127-
trybuild = "=1.0.0"
86+
regex = { workspace = true }
87+
trybuild = { workspace = true }

0 commit comments

Comments
 (0)