Skip to content

Commit 597ecfb

Browse files
authored
chore: move dev dependencies to workspace (#6966)
## Description Moves dev dependencies to the workspace Cargo.toml for consistent versions in tests. Inspired by #6955 ## Checklist - [ ] I have linked to any relevant issues. - [ ] I have commented my code, particularly in hard-to-understand areas. - [ ] I have updated the documentation where relevant (API docs, the reference, and the Sway book). - [ ] If my change requires substantial documentation changes, I have [requested support from the DevRel team](https://github.com/FuelLabs/devrel-requests/issues/new/choose) - [ ] I have added tests that prove my fix is effective or that my feature works. - [ ] I have added (or requested a maintainer to add) the necessary `Breaking*` or `New Feature` labels where relevant. - [ ] I have done my best to ensure that my PR adheres to [the Fuel Labs Code Review Standards](https://github.com/FuelLabs/rfcs/blob/master/text/code-standards/external-contributors.md). - [ ] I have requested a review from the relevant team or maintainers.
1 parent 1c3183a commit 597ecfb

File tree

17 files changed

+290
-527
lines changed

17 files changed

+290
-527
lines changed

Cargo.lock

+238-490
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+15
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ annotate-snippets = "0.10"
116116
ansiterm = "0.12"
117117
anyhow = "1.0"
118118
assert-json-diff = "2.0"
119+
assert_matches = "1.5.0"
119120
async-trait = "0.1"
120121
aws-config = "1.5"
121122
aws-sdk-kms = "1.44"
@@ -127,20 +128,27 @@ cid = "0.11"
127128
clap = "4.5"
128129
clap_complete = "4.5"
129130
clap_complete_fig = "4.5"
131+
codspeed-criterion-compat = "2.6.0"
130132
colored = "2.0"
133+
completest-pty = "0.5.0"
131134
comrak = "0.28"
135+
criterion = "0.5"
132136
crossbeam-channel = "0.5"
133137
dap = "0.4.1-alpha"
134138
dashmap = "6.1"
135139
devault = "0.2"
136140
dialoguer = "0.11"
141+
dir_indexer = "0.0.2"
137142
dirs = "5.0"
138143
downcast-rs = "1.2"
144+
duct = "0.13.7"
139145
duplicate = "2.0"
140146
either = "1.9"
147+
escargot = "0.5.7"
141148
ethabi = { package = "fuel-ethabi", version = "18.0" }
142149
etk-asm = { package = "fuel-etk-asm", version = "0.3.1-dev" }
143150
etk-ops = { package = "fuel-etk-ops", version = "0.3.1-dev" }
151+
expect-test = "1.4.1"
144152
extension-trait = "1.0"
145153
fd-lock = "4.0"
146154
filecheck = "0.5"
@@ -186,6 +194,7 @@ pest = "2.7"
186194
pest_derive = "2.7"
187195
petgraph = "0.6"
188196
phf = "0.11"
197+
portpicker = "0.1.1"
189198
pretty_assertions = "1.4"
190199
prettydiff = "0.7"
191200
proc-macro2 = "1.0"
@@ -195,6 +204,7 @@ rayon = "1.7"
195204
rayon-cond = "0.3"
196205
regex = "1.10"
197206
reqwest = "0.12"
207+
rexpect = "0.6"
198208
revm = "14.0"
199209
ropey = "1.5"
200210
rpassword = "7.2"
@@ -210,11 +220,14 @@ serial_test = "3.0"
210220
sha1 = "0.10"
211221
sha2 = "0.10"
212222
sha3 = "0.10"
223+
similar = "2.0"
213224
slotmap = "1.0"
214225
smallvec = "1.7"
215226
strsim = "0.11"
216227
strum = "0.26"
217228
syn = "2.0"
229+
sysinfo = "0.29"
230+
tai64 = "4.0"
218231
taplo = "0.13"
219232
tar = "0.4"
220233
tempfile = "3"
@@ -230,6 +243,7 @@ tower = { version = "0.5", default-features = false }
230243
tower-lsp = "0.20"
231244
tracing = "0.1"
232245
tracing-subscriber = "0.3"
246+
tracing-test = "0.2"
233247
uint = "0.9"
234248
unicode-bidi = "0.3"
235249
unicode-xid = "0.2"
@@ -240,3 +254,4 @@ vec1 = "1.8"
240254
vte = "0.13"
241255
walkdir = "2.3"
242256
whoami = "1.5"
257+
wiremock = "0.6"

forc-pkg/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ vec1.workspace = true
4242
walkdir.workspace = true
4343

4444
[dev-dependencies]
45-
regex = "^1.10.2"
45+
regex.workspace = true
4646
tempfile.workspace = true
4747

4848
[target.'cfg(not(target_os = "macos"))'.dependencies]
49-
sysinfo = "0.29"
49+
sysinfo.workspace = true
5050

forc-plugins/forc-client/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ tracing.workspace = true
5959
url.workspace = true
6060

6161
[dev-dependencies]
62-
portpicker = "0.1.1"
63-
pretty_assertions = "1.4.1"
64-
rexpect = "0.5"
62+
portpicker.workspace = true
63+
pretty_assertions.workspace = true
64+
rexpect.workspace = true
6565

6666
[build-dependencies]
67-
regex = "1.5.4"
67+
regex.workspace = true
6868

6969
[[bin]]
7070
name = "forc-deploy"

forc-plugins/forc-crypto/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ tokio = { workspace = true, features = ["macros", "rt-multi-thread", "process"]
3333
tracing.workspace = true
3434

3535
[dev-dependencies]
36-
criterion = "0.5"
36+
criterion.workspace = true
3737
tempfile.workspace = true
3838

3939
[[bench]]

forc-plugins/forc-debug/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ walkdir.workspace = true
4040

4141
[dev-dependencies]
4242
dap = { version = "0.4.1-alpha1", features = ["client"] }
43-
escargot = "0.5.7"
44-
portpicker = "0.1.1"
45-
rexpect = "0.4"
43+
escargot.workspace = true
44+
portpicker.workspace = true
45+
rexpect.workspace = true

forc-plugins/forc-doc/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ sway-types.workspace = true
2929
swayfmt.workspace = true
3030

3131
[dev-dependencies]
32-
dir_indexer = "0.0.2"
33-
expect-test = "1.4.1"
32+
dir_indexer.workspace = true
33+
expect-test.workspace = true

forc-plugins/forc-node/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ termion.workspace = true
2424
tokio = { workspace = true, features = ["macros", "signal", "rt-multi-thread"] }
2525

2626
[dev-dependencies]
27-
portpicker = "0.1.1"
27+
portpicker.workspace = true
2828
reqwest = { workspace = true, features = ["json"] }
2929
serde_json.workspace = true
3030
tempfile.workspace = true
3131
tokio = { workspace = true, features = ["full"] }
32-
wiremock = "0.5"
32+
wiremock.workspace = true
3333

3434
[lib]
3535
path = "src/lib.rs"

forc-plugins/forc-publish/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ uuid = { workspace = true, features = ["v4", "serde"] }
2828
walkdir.workspace = true
2929

3030
[dev-dependencies]
31-
wiremock = "0.6.2"
31+
wiremock.workspace = true

forc-tracing/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ tracing.workspace = true
1414
tracing-subscriber = { workspace = true, features = ["ansi", "env-filter", "json"] }
1515

1616
[dev-dependencies]
17-
tracing-test = "0.2"
17+
tracing-test.workspace = true

forc/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@ util = []
5454
profile = []
5555

5656
[dev-dependencies]
57-
completest-pty = "0.5.0"
58-
rexpect = "0.5"
57+
completest-pty.workspace = true
58+
rexpect.workspace = true

sway-core/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ uint.workspace = true
4949
vec1.workspace = true
5050

5151
[target.'cfg(not(target_os = "macos"))'.dependencies]
52-
sysinfo = "0.29.0"
52+
sysinfo.workspace = true
5353

5454
[lints.clippy]
5555
iter_over_hash_type = "deny"

sway-lsp/Cargo.toml

+10-10
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,20 @@ tracing.workspace = true
5454
urlencoding.workspace = true
5555

5656
[dev-dependencies]
57-
assert-json-diff = "2.0"
58-
codspeed-criterion-compat = "2.6.0"
59-
criterion = "0.5"
60-
dirs = "4.0"
61-
futures = { version = "0.3", default-features = false, features = [
57+
assert-json-diff.workspace = true
58+
codspeed-criterion-compat.workspace = true
59+
criterion.workspace = true
60+
dirs.workspace = true
61+
futures = { workspace = true, default-features = false, features = [
6262
"std",
6363
"async-await",
6464
] }
65-
pretty_assertions = "1.4.0"
66-
rand = "0.8"
67-
regex = "^1.10.2"
65+
pretty_assertions.workspace = true
66+
rand.workspace = true
67+
regex.workspace = true
6868
sway-lsp-test-utils = { path = "tests/utils" }
69-
tikv-jemallocator = "0.6"
70-
tower = { version = "0.4.12", default-features = false, features = ["util"] }
69+
tikv-jemallocator.workspace = true
70+
tower = { workspace = true, default-features = false, features = ["util"] }
7171

7272
[[bench]]
7373
name = "bench_main"

sway-parse/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ unicode-bidi.workspace = true
2121
unicode-xid.workspace = true
2222

2323
[dev-dependencies]
24-
assert_matches = "1.5.0"
25-
insta = { version = "1.28.0", features = ["ron"] }
24+
assert_matches.workspace = true
25+
insta = { workspace = true, features = ["ron"] }
2626

2727
[lints.clippy]
2828
iter_over_hash_type = "deny"

swayfmt/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ thiserror.workspace = true
2424
toml = { workspace = true, features = ["parse"] }
2525

2626
[dev-dependencies]
27-
paste = "1.0"
28-
prettydiff = "0.7"
29-
similar = "2.0"
27+
paste.workspace = true
28+
prettydiff.workspace = true
29+
similar.workspace = true
3030
test-macros = { path = "test_macros" }

swayfmt/test_macros/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ repository.workspace = true
1414
[dependencies]
1515

1616
[dev-dependencies]
17-
paste = "1.0"
18-
prettydiff = "0.7"
17+
paste.workspace = true
18+
prettydiff.workspace = true
1919

2020
[package.metadata.cargo-udeps.ignore]
2121
development = ["paste", "prettydiff"]

test/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ anyhow.workspace = true
1010
bytes.workspace = true
1111
clap = { workspace = true, features = ["derive", "env"] }
1212
colored.workspace = true
13-
duct = "0.13.7"
13+
duct.workspace = true
1414
filecheck.workspace = true
1515
forc = { workspace = true, features = ["test"] }
1616
forc-client.workspace = true

0 commit comments

Comments
 (0)