Skip to content

Commit fb4b66b

Browse files
ethowitzethowitz
committed
treewide: Use workspace dependencies
To make versioning more consistent, to make upgrades easier, and to reduce the number of duplicates in our dependency graph, this commit replaces all of the crate-specific package versions with universal workspace dependencies. Change-Id: I95db5ded6d4ac1b530751d2a873240c5d023a5b4 Reviewed-on: https://gerrit.readyset.name/c/readyset/+/7373 Reviewed-by: Jason Brown <[email protected]> Tested-by: Buildkite CI
1 parent 45298ff commit fb4b66b

File tree

57 files changed

+910
-798
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+910
-798
lines changed

‎Cargo.lock‎

Lines changed: 53 additions & 111 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ clap = "4.3"
6666
consulrs = { git = "https://github.com/readysettech/consulrs.git", branch = "allow-disabling-rustls-tls-2" }
6767
criterion = "0.5"
6868
eui48 = { git = "https://github.com/readysettech/eui48.git", branch = "master", default-features = false }
69+
fork = "0.1"
6970
mysql_async = { git = "https://github.com/readysettech/mysql_async" }
7071
nperf-core = { git = "https://github.com/readysettech/not-perf.git" }
7172
postgres = { git = "https://github.com/readysettech/rust-postgres.git"}
@@ -79,6 +80,171 @@ rocksdb = { git = "https://github.com/readysettech/rust-rocksdb.git", default-fe
7980
metrics-exporter-prometheus = { git = "https://github.com/readysettech/metrics.git" }
8081
metrics = { git = "https://github.com/readysettech/metrics.git" }
8182
metrics-util = { git = "https://github.com/readysettech/metrics.git" }
83+
ahash = "0.7"
84+
anyhow = "1.0.42"
85+
assert_approx_eq = "1.1.0"
86+
assert_unordered = "0.3"
87+
async-bincode = "0.6.1"
88+
async-stream = "0.3.2"
89+
async-trait = "0.1"
90+
atomic-counter = "1.0.1"
91+
backoff = "0.4.0"
92+
backtrace = "=0.3.65"
93+
bimap = "0.6.3"
94+
bincode = "1.3.3"
95+
bit-vec = "0.6"
96+
blake2 = "0.10"
97+
bufstream = "0.1.3"
98+
byteorder = "1.0.0"
99+
bytes = "1.0.1"
100+
chashmap = "2.1.0"
101+
chrono = "0.4.19"
102+
chrono-tz = "0.8.6"
103+
cidr = "0.2.1"
104+
cloudflare-zlib = "0.2.9"
105+
console = "0.15.5"
106+
const-str = "0.5"
107+
crossbeam-skiplist = "0.1.1"
108+
csv = "1.2"
109+
dashmap = "4.0.2"
110+
deadpool-postgres = "0.10.3"
111+
derive_builder = "0.11.2"
112+
derive_more = "0.99.17"
113+
diff = "0.1.10"
114+
enum-display-derive = "0.1.1"
115+
enum-kinds = "0.5.1"
116+
enum_dispatch = "0.3.7"
117+
envy = "0.4"
118+
fail = "0.5.0"
119+
fallible-iterator = "0.2.0"
120+
fixedbitset = { version = "0.2.0", default-features = false }
121+
futures = "0.3.21"
122+
futures-core = "0.3.14"
123+
futures-executor = "0.3.14"
124+
futures-sink = "0.3.14"
125+
futures-util = "0.3.14"
126+
fxhash = "0.2.1"
127+
getrandom = "0.2.2"
128+
growable-bloom-filter = "2.0.1"
129+
hashbag = "0.1.2"
130+
hdrhistogram = "7.4"
131+
hex = "0.4.3"
132+
hmac = "0.12.1"
133+
humantime = "2.1"
134+
hyper = "0.14.10"
135+
include_dir = "0.6.2"
136+
indexmap = { version = "1.9.2", default-features = false }
137+
indicatif = "0.17"
138+
indoc = "1.0.3"
139+
iter-enum = "1.1.1"
140+
itertools = "0.10.4"
141+
lazy_static = "1.4.0"
142+
left-right = "0.11"
143+
libc = "0.2"
144+
lru = "0.12.0"
145+
machine-uid = "0.2"
146+
md5 = "0.7.0"
147+
mysql = "25"
148+
mysql_common = "0.32"
149+
native-tls = "0.2.8"
150+
ndarray = "0.15.4"
151+
nom = "7.1.1"
152+
nom_locate = "4.0.0"
153+
notify = "6.1.1"
154+
num-integer = "0.1.44"
155+
num_cpus = "1.16.0"
156+
once_cell = "1.14"
157+
opentelemetry = "0.21.0"
158+
opentelemetry-otlp = "0.14.0"
159+
opentelemetry-semantic-conventions = "0.13"
160+
opentelemetry_sdk = "0.21.2"
161+
parking_lot = "0.12.0"
162+
paste = "1.0.5"
163+
petgraph = "0.5"
164+
pin-project = "1.0"
165+
pprof = "0.13"
166+
pratt = "0.3.0"
167+
pretty_assertions = "1.4.0"
168+
prettytable = "0.10.0"
169+
proc-macro2 = "1"
170+
prometheus-parse = "0.2.2"
171+
proptest = "1.0.0"
172+
quanta = { version = "0.11", default-features = false }
173+
querystring = "1.1.0"
174+
quote = "1.0.8"
175+
rand = "0.8.5"
176+
rand_distr = "0.4"
177+
rand_regex = "0.15.1"
178+
redis = "0.23.3"
179+
regex = "1.8.4"
180+
reqwest = "0.11.20"
181+
rlimit = "0.10.1"
182+
rmp-serde = "1.1.2"
183+
rust_decimal = "1.26"
184+
rusty-fork = "0.3.0"
185+
rustyline = "11.0"
186+
rustyline-derive = "0.6.0"
187+
scopeguard = "1.1.0"
188+
serde = "1.0.137"
189+
serde_bytes = "0.11"
190+
serde_derive = "1.0.8"
191+
serde_json = "1.0.89"
192+
serde_stacker = "0.1.7"
193+
serde_with = "1.12"
194+
serde_with_macros = "2.0.0"
195+
serde_yaml = "0.8"
196+
serial_test = "0.5.1"
197+
sha-1 = "0.10.0"
198+
sha1 = "0.10"
199+
sha2 = "0.10.6"
200+
slab = "0.4.2"
201+
slotmap = "1.0.6"
202+
smallvec = { version = "1.9.0", default-features = false }
203+
socket2 = "0.4"
204+
sqlformat = "0.2.1"
205+
sqlparser = "0.41.0"
206+
strawpoll = "0.2.2"
207+
streaming-iterator = "0.1"
208+
stringprep = "0.1.2"
209+
structopt = "0.2"
210+
strum = "0.23"
211+
strum_macros = "0.23"
212+
syn = { version = "1.0.57", default-features = false }
213+
temp-dir = "0.1"
214+
tempfile = "3.8.1"
215+
test-strategy = "0.2.0"
216+
textwrap = "0.14"
217+
thiserror = "1.0.31"
218+
tikv-jemalloc-ctl = "0.5.0"
219+
tikv-jemalloc-sys = "0.5.0"
220+
tikv-jemallocator = "0.5.0"
221+
time = "0.3"
222+
timekeeper = { version = "0.3.2", default-features = false }
223+
tokio-native-tls = "0.3.1"
224+
tokio-retry = "0.3"
225+
tokio-scoped = "0.2.0"
226+
tokio-stream = "0.1.5"
227+
tokio-tower = "0.5.1"
228+
tokio-util = "0.6.6"
229+
toml = "0.5"
230+
tower = "0.4.6"
231+
tower-layer = "0.3.1"
232+
tower-service = "0.3.1"
233+
tracing = "0.1.40"
234+
tracing-appender = "0.2.3"
235+
tracing-attributes = "0.1.27"
236+
tracing-futures = "0.2.5"
237+
tracing-opentelemetry = "0.22.0"
238+
tracing-subscriber = "0.3.9"
239+
triomphe = "0.1"
240+
tuple = "0.5.1"
241+
url = "2.2.2"
242+
uuid = "0.8"
243+
vec1 = "1.8.0"
244+
vec_map = "0.8.0"
245+
vmemcached = "0.5.0"
246+
walkdir = "2.3.2"
247+
zipf = "7.0.0"
82248

83249
[profile.release]
84250
debug=true

‎array2/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ authors = ["ReadySet Technology, Inc. <[email protected]>"]
66
edition = "2021"
77

88
[dependencies]
9-
serde = { version = "1.0.137", features = ["derive"] }
10-
thiserror = "1.0.31"
9+
serde = { workspace = true, features = ["derive"] }
10+
thiserror = { workspace = true }

‎benchmarks/Cargo.toml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,45 +6,45 @@ authors = ["ReadySet Technology, Inc. <[email protected]>"]
66
edition = "2021"
77

88
[dependencies]
9-
crossbeam-skiplist = "0.1.1"
9+
crossbeam-skiplist = { workspace = true }
1010
tokio = { workspace = true, features = ["full"] }
11-
anyhow = "1.0.38"
12-
csv = "1.2"
13-
nom = "7.1"
14-
nom_locate = "4.0.0"
15-
rand = "0.8.3"
16-
rand_distr = "0.4"
17-
tracing = "0.1.29"
18-
async-trait = "0.1"
19-
enum_dispatch = "0.3.7"
20-
futures = "0.3"
21-
vec1 = "1.8.0"
22-
url = "2.2.2"
23-
hdrhistogram = "7.4"
24-
zipf = "7.0.0"
11+
anyhow = { workspace = true }
12+
csv = { workspace = true }
13+
nom = { workspace = true }
14+
nom_locate = { workspace = true }
15+
rand = { workspace = true }
16+
rand_distr = { workspace = true }
17+
tracing = { workspace = true }
18+
async-trait = { workspace = true }
19+
enum_dispatch = { workspace = true }
20+
futures = { workspace = true }
21+
vec1 = { workspace = true }
22+
url = { workspace = true }
23+
hdrhistogram = { workspace = true }
24+
zipf = { workspace = true }
2525
clap = { workspace = true, features = ["derive", "env"] }
26-
reqwest = { version = "0.11.20", features = ["stream", "native-tls"] }
27-
chrono = "0.4"
28-
atomic-counter = "1.0.1"
29-
serde_json = "1.0"
30-
serde_yaml = "0.8"
31-
serde = "1.0"
32-
serde_with = "1.12"
26+
reqwest = { workspace = true, features = ["stream", "native-tls"] }
27+
chrono = { workspace = true }
28+
atomic-counter = { workspace = true }
29+
serde_json = { workspace = true }
30+
serde_yaml = { workspace = true }
31+
serde = { workspace = true }
32+
serde_with = { workspace = true }
3333
metrics = { workspace = true }
3434
metrics-util = { workspace = true }
3535
metrics-exporter-prometheus = { workspace = true }
36-
itertools = "0.10"
37-
num-integer = "0.1.44"
38-
lazy_static = "1.4.0"
39-
thiserror = "1.0.30"
40-
async-stream = "0.3.2"
41-
parking_lot = "0.11.2"
42-
indicatif = "0.17"
43-
prometheus-parse = "0.2.2"
44-
walkdir = "2.3"
36+
itertools = { workspace = true }
37+
num-integer = { workspace = true }
38+
lazy_static = { workspace = true }
39+
thiserror = { workspace = true }
40+
async-stream = { workspace = true }
41+
parking_lot = { workspace = true }
42+
indicatif = { workspace = true }
43+
prometheus-parse = { workspace = true }
44+
walkdir = { workspace = true }
4545
tokio-postgres = { workspace = true }
46-
vmemcached = "0.5.0"
47-
redis = { version = "0.23.3", features = ["tokio-comp", "aio"] }
46+
vmemcached = { workspace = true }
47+
redis = { workspace = true, features = ["tokio-comp", "aio"] }
4848

4949
# local dependencies
5050
database-utils = { path = "../database-utils" }
@@ -96,8 +96,8 @@ path = "src/bin/snapshot_time.rs"
9696
[features]
9797

9898
[dev-dependencies]
99-
indoc = "1.0.3"
100-
itertools = "0.10"
101-
proptest = "1.0.0"
102-
test-strategy = "0.2.0"
103-
url = "2.2.2"
99+
indoc = { workspace = true }
100+
itertools = { workspace = true }
101+
proptest = { workspace = true }
102+
test-strategy = { workspace = true }
103+
url = { workspace = true }

‎concrete-iter/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ authors = ["ReadySet Technology, Inc. <[email protected]>"]
66
edition = "2021"
77

88
[dependencies]
9-
syn = { version = "1.0.57", features = ["full", "parsing", "printing", "visit", "visit-mut", "extra-traits"] }
10-
quote = "1.0.8"
11-
proc-macro2 = "1"
9+
syn = { workspace = true, features = ["full", "parsing", "printing", "visit", "visit-mut", "extra-traits"] }
10+
quote = { workspace = true }
11+
proc-macro2 = { workspace = true }
1212

1313
[lib]
1414
proc-macro = true

‎data-generator/Cargo.toml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ authors = ["ReadySet Technology, Inc. <[email protected]>"]
66
edition = "2021"
77

88
[dependencies]
9-
anyhow = "1.0.38"
10-
bit-vec = { version = "0.6", features = ["serde"] }
11-
chrono = "0.4.19"
9+
anyhow = { workspace = true }
10+
bit-vec = { workspace = true, features = ["serde"] }
11+
chrono = { workspace = true }
1212
eui48 = { workspace = true }
13-
growable-bloom-filter = "2.0.1"
14-
rand = "0.8.3"
15-
rand_regex = "0.15.1"
16-
rust_decimal = "1.26"
17-
uuid = "0.8"
18-
zipf = "7.0.0"
13+
growable-bloom-filter = { workspace = true }
14+
rand = { workspace = true }
15+
rand_regex = { workspace = true }
16+
rust_decimal = { workspace = true }
17+
uuid = { workspace = true }
18+
zipf = { workspace = true }
1919

2020
nom-sql = { path = "../nom-sql" }
2121
readyset-data = { path = "../readyset-data/" }
2222

2323
[dev-dependencies]
24-
test-strategy = "0.2.0"
25-
proptest = "1.0.0"
24+
test-strategy = { workspace = true }
25+
proptest = { workspace = true }
2626
mysql_async = { workspace = true }
2727
tokio = { workspace = true, features = ["full"] }
28-
serial_test = "0.5"
28+
serial_test = { workspace = true }
2929
test-utils = { path = "../test-utils" }

‎database-utils/Cargo.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ authors = ["ReadySet Technology, Inc. <[email protected]>"]
66
edition = "2021"
77

88
[dependencies]
9-
derive_more = "0.99.17"
10-
futures = "0.3.21"
9+
derive_more = { workspace = true }
10+
futures = { workspace = true }
1111
mysql_async = { workspace = true }
12-
native-tls = "0.2.8"
13-
thiserror = "1.0.30"
12+
native-tls = { workspace = true }
13+
thiserror = { workspace = true }
1414
tokio = { workspace = true, features = ["full"] }
1515
tokio-postgres = { workspace = true, features = ["with-chrono-0_4"] }
1616
postgres-native-tls = { workspace = true }
1717
clap = { workspace = true, features = ["derive","env"] }
18-
serde = { version = "1.0", features = ["derive"] }
18+
serde = { workspace = true, features = ["derive"] }
1919
readyset-util = { path = "../readyset-util" }
2020
readyset-errors = { path = "../readyset-errors" }
21-
async-trait = "0.1"
21+
async-trait = { workspace = true }
2222
nom-sql = { path = "../nom-sql" }
23-
deadpool-postgres = "0.10.3"
24-
num_cpus = "1.15.0"
23+
deadpool-postgres = { workspace = true }
24+
num_cpus = { workspace = true }

‎dataflow-expression/Cargo.toml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ authors = ["ReadySet Technology, Inc. <[email protected]>"]
66
edition = "2021"
77

88
[dependencies]
9-
chrono = { version = "0.4.0", features = ["serde"] }
10-
chrono-tz = { version = "0.8.6", features = ["serde"] }
11-
serde = { version = "1.0.8", features = ["derive"] }
12-
serde_json = { version = "1.0" }
13-
rust_decimal = { version = "1.26" }
14-
lazy_static = "1.4.0"
15-
regex = "1.4.3"
16-
itertools = "0.10.3"
17-
vec1 = "1.6"
18-
proptest = "1.0.0"
19-
test-strategy = "0.2.0"
9+
chrono = { workspace = true, features = ["serde"] }
10+
chrono-tz = { workspace = true, features = ["serde"] }
11+
serde = { workspace = true, features = ["derive"] }
12+
serde_json = { workspace = true }
13+
rust_decimal = { workspace = true }
14+
lazy_static = { workspace = true }
15+
regex = { workspace = true }
16+
itertools = { workspace = true }
17+
vec1 = { workspace = true }
18+
proptest = { workspace = true }
19+
test-strategy = { workspace = true }
2020

2121
# Local deps
2222
readyset-util = { path = "../readyset-util" }

0 commit comments

Comments
 (0)