Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: avoid duplicate crates #6955

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -240,3 +240,16 @@ vec1 = "1.8"
vte = "0.13"
walkdir = "2.3"
whoami = "1.5"
assert_matches = "1.5.0"
codspeed-criterion-compat = "2.6.0"
completest-pty = "0.5.0"
criterion = "0.5"
dir_indexer = "0.0.2"
duct = "0.13.7"
escargot = "0.5.7"
expect-test = "1.4.1"
portpicker = "0.1.1"
similar = "2.0"
sway-lsp-test-utils = { path = "sway-lsp/tests/utils" }
test-macros = { path = "swayfmt/test_macros" }
tracing-test = "0.2"
2 changes: 1 addition & 1 deletion forc-pkg/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ vec1.workspace = true
walkdir.workspace = true

[dev-dependencies]
regex = "^1.10.2"
regex = { workspace = true }
tempfile.workspace = true

[target.'cfg(not(target_os = "macos"))'.dependencies]
Expand Down
6 changes: 3 additions & 3 deletions forc-plugins/forc-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ tracing.workspace = true
url.workspace = true

[dev-dependencies]
portpicker = "0.1.1"
pretty_assertions = "1.4.1"
portpicker = { workspace = true }
pretty_assertions = { workspace = true }
rexpect = "0.5"

[build-dependencies]
regex = "1.5.4"
regex = { workspace = true }

[[bin]]
name = "forc-deploy"
Expand Down
2 changes: 1 addition & 1 deletion forc-plugins/forc-crypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ tokio = { workspace = true, features = ["macros", "rt-multi-thread", "process"]
tracing.workspace = true

[dev-dependencies]
criterion = "0.5"
criterion = { workspace = true }
tempfile.workspace = true

[[bench]]
Expand Down
4 changes: 2 additions & 2 deletions forc-plugins/forc-debug/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ walkdir.workspace = true

[dev-dependencies]
dap = { version = "0.4.1-alpha1", features = ["client"] }
escargot = "0.5.7"
portpicker = "0.1.1"
escargot = { workspace = true }
portpicker = { workspace = true }
rexpect = "0.4"
4 changes: 2 additions & 2 deletions forc-plugins/forc-doc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ sway-types.workspace = true
swayfmt.workspace = true

[dev-dependencies]
dir_indexer = "0.0.2"
expect-test = "1.4.1"
dir_indexer = { workspace = true }
expect-test = { workspace = true }
2 changes: 1 addition & 1 deletion forc-plugins/forc-node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ termion.workspace = true
tokio = { workspace = true, features = ["macros", "signal", "rt-multi-thread"] }

[dev-dependencies]
portpicker = "0.1.1"
portpicker = { workspace = true }
reqwest = { workspace = true, features = ["json"] }
serde_json.workspace = true
tempfile.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion forc-tracing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ tracing.workspace = true
tracing-subscriber = { workspace = true, features = ["ansi", "env-filter", "json"] }

[dev-dependencies]
tracing-test = "0.2"
tracing-test = { workspace = true }
2 changes: 1 addition & 1 deletion forc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@ util = []
profile = []

[dev-dependencies]
completest-pty = "0.5.0"
completest-pty = { workspace = true }
rexpect = "0.5"
2 changes: 1 addition & 1 deletion sway-ir/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ once_cell.workspace = true
peg.workspace = true
prettydiff.workspace = true
rustc-hash.workspace = true
serde = { version = "1.0", features = ["derive"] }
serde = { workspace = true, features = ["derive"] }
slotmap.workspace = true
sway-features.workspace = true
sway-ir-macros.workspace = true
Expand Down
21 changes: 9 additions & 12 deletions sway-lsp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,16 @@ tracing.workspace = true
urlencoding.workspace = true

[dev-dependencies]
assert-json-diff = "2.0"
codspeed-criterion-compat = "2.6.0"
criterion = "0.5"
assert-json-diff = { workspace = true }
codspeed-criterion-compat = { workspace = true }
criterion = { workspace = true }
dirs = "4.0"
futures = { version = "0.3", default-features = false, features = [
"std",
"async-await",
] }
pretty_assertions = "1.4.0"
rand = "0.8"
regex = "^1.10.2"
sway-lsp-test-utils = { path = "tests/utils" }
tikv-jemallocator = "0.6"
futures = { workspace = true, features = ["std", "async-await"] }
pretty_assertions = { workspace = true }
rand = { workspace = true }
regex = { workspace = true }
sway-lsp-test-utils = { workspace = true }
tikv-jemallocator = { workspace = true }
tower = { version = "0.4.12", default-features = false, features = ["util"] }

[[bench]]
Expand Down
4 changes: 2 additions & 2 deletions sway-parse/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ unicode-bidi.workspace = true
unicode-xid.workspace = true

[dev-dependencies]
assert_matches = "1.5.0"
insta = { version = "1.28.0", features = ["ron"] }
assert_matches = { workspace = true }
insta = { workspace = true, features = ["ron"] }

[lints.clippy]
iter_over_hash_type = "deny"
8 changes: 4 additions & 4 deletions swayfmt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ thiserror.workspace = true
toml = { workspace = true, features = ["parse"] }

[dev-dependencies]
paste = "1.0"
prettydiff = "0.7"
similar = "2.0"
test-macros = { path = "test_macros" }
paste = { workspace = true }
prettydiff = { workspace = true }
similar = { workspace = true }
test-macros = { workspace = true }
4 changes: 2 additions & 2 deletions swayfmt/test_macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ repository.workspace = true
[dependencies]

[dev-dependencies]
paste = "1.0"
prettydiff = "0.7"
paste = { workspace = true }
prettydiff = { workspace = true }

[package.metadata.cargo-udeps.ignore]
development = ["paste", "prettydiff"]
2 changes: 1 addition & 1 deletion test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ anyhow.workspace = true
bytes.workspace = true
clap = { workspace = true, features = ["derive", "env"] }
colored.workspace = true
duct = "0.13.7"
duct = { workspace = true }
filecheck.workspace = true
forc = { workspace = true, features = ["test"] }
forc-client.workspace = true
Expand Down