From b169e1f719057a59884cf9b122288b694dce4fa8 Mon Sep 17 00:00:00 2001 From: Samuel Moelius Date: Sun, 22 Dec 2024 20:07:00 -0500 Subject: [PATCH] Use more workspace dependencies --- Cargo.toml | 42 ++++++++++++++ cargo-dylint/Cargo.toml | 34 +++++------ dylint-link/Cargo.toml | 14 ++--- dylint/Cargo.toml | 56 +++++++++---------- examples/Cargo.toml | 8 +-- examples/general/Cargo.toml | 7 +++ examples/general/abs_home_path/Cargo.toml | 4 +- .../await_holding_span_guard/Cargo.toml | 2 +- .../Cargo.toml | 8 +-- .../wrong_serialize_struct_arg/Cargo.toml | 4 +- examples/restriction/Cargo.toml | 13 +++++ .../restriction/collapsible_unwrap/Cargo.toml | 4 +- .../restriction/const_path_join/Cargo.toml | 2 +- .../inconsistent_qualification/Cargo.toml | 2 +- .../misleading_variable_name/Cargo.toml | 6 +- .../restriction/overscoped_allow/Cargo.toml | 14 ++--- .../question_mark_in_expression/Cargo.toml | 4 +- .../restriction/suboptimal_pattern/Cargo.toml | 2 +- examples/restriction/try_io_result/Cargo.toml | 4 +- examples/supplementary/Cargo.toml | 8 +++ .../supplementary/commented_code/Cargo.toml | 6 +- .../escaping_doc_link/Cargo.toml | 8 +-- .../redundant_reference/Cargo.toml | 2 +- .../supplementary/unnamed_constant/Cargo.toml | 2 +- .../Cargo.toml | 2 +- expensive/Cargo.toml | 4 +- internal/Cargo.toml | 46 ++++++++------- utils/testing/Cargo.toml | 16 +++--- 28 files changed, 196 insertions(+), 128 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 570392a90..5d8ca57da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,6 +15,48 @@ members = [ ] resolver = "2" +[workspace.dependencies] +ansi_term = "0.12" +anyhow = "1.0" +assert_cmd = "2.0" +bitflags = "2.6" +cargo = "0.81" +cargo-platform = "0.1" +cargo-util = "0.2" +cargo-util-schemas = "0.7" +cargo_metadata = "0.19" +clap = "4.5" +compiletest_rs = "0.11" +ctor = "0.2" +dirs = "5.0" +dunce = "1.0" +env_logger = "0.11" +fs_extra = "1.3" +git2 = "0.18" +glob = "0.3" +heck = "0.5" +hex = "0.4" +home = "0.5" +if_chain = "1.0" +is-terminal = "0.4" +log = "0.4" +once_cell = "1.20" +predicates = "3.1" +regex = "1.11" +rewriter = "0.1" +rust-embed = "8.5" +semver = "1.0" +serde = "1.0" +serde-untagged = "0.1" +serde_json = "1.0" +similar-asserts = "1.6" +tempfile = "3.14" +thiserror = "2.0" +toml = "0.8" +toml_edit = "0.22" +url = "2.5" +walkdir = "2.5" + [workspace.lints.rust.unexpected_cfgs] level = "deny" check-cfg = [ diff --git a/cargo-dylint/Cargo.toml b/cargo-dylint/Cargo.toml index 448d06af8..5145812f9 100644 --- a/cargo-dylint/Cargo.toml +++ b/cargo-dylint/Cargo.toml @@ -12,9 +12,9 @@ name = "ci" required-features = ["__ci"] [dependencies] -anyhow = { version = "1.0", features = ["backtrace"] } -clap = { version = "4.5", features = ["cargo", "derive", "wrap_help"] } -env_logger = "0.11" +anyhow = { workspace = true, features = ["backtrace"] } +clap = { workspace = true, features = ["cargo", "derive", "wrap_help"] } +env_logger = { workspace = true } dylint = { version = "=3.3.0", path = "../dylint", features = [ "package_options", @@ -22,20 +22,20 @@ dylint = { version = "=3.3.0", path = "../dylint", features = [ dylint_internal = { version = "=3.3.0", path = "../internal" } [dev-dependencies] -assert_cmd = "2.0" -cargo_metadata = "0.19" -ctor = "0.2" -glob = "0.3" -home = "0.5" -log = "0.4" -once_cell = "1.20" -predicates = "3.1" -regex = "1.11" -semver = "1.0" -serde_json = "1.0" -similar-asserts = "1.6" -tempfile = "3.14" -walkdir = "2.5" +assert_cmd = { workspace = true } +cargo_metadata = { workspace = true } +ctor = { workspace = true } +glob = { workspace = true } +home = { workspace = true } +log = { workspace = true } +once_cell = { workspace = true } +predicates = { workspace = true } +regex = { workspace = true } +semver = { workspace = true } +serde_json = { workspace = true } +similar-asserts = { workspace = true } +tempfile = { workspace = true } +walkdir = { workspace = true } dylint_internal = { version = "=3.3.0", path = "../internal", features = [ "examples", diff --git a/dylint-link/Cargo.toml b/dylint-link/Cargo.toml index 5b588ece9..e7d4216fa 100644 --- a/dylint-link/Cargo.toml +++ b/dylint-link/Cargo.toml @@ -8,10 +8,10 @@ license = "MIT OR Apache-2.0" repository = "https://github.com/trailofbits/dylint" [dependencies] -anyhow = "1.0" -env_logger = "0.11" -if_chain = "1.0" -toml_edit = "0.22" +anyhow = { workspace = true } +env_logger = { workspace = true } +if_chain = { workspace = true } +toml_edit = { workspace = true } dylint_internal = { version = "=3.3.0", path = "../internal", features = [ "cargo", @@ -21,9 +21,9 @@ dylint_internal = { version = "=3.3.0", path = "../internal", features = [ dylint_internal = { version = "=3.3.0", path = "../internal" } [dev-dependencies] -assert_cmd = "2.0" -predicates = "3.1" -tempfile = "3.14" +assert_cmd = { workspace = true } +predicates = { workspace = true } +tempfile = { workspace = true } dylint_internal = { version = "=3.3.0", path = "../internal", features = [ "packaging", diff --git a/dylint/Cargo.toml b/dylint/Cargo.toml index 3f0769d0c..2bb14f7b8 100644 --- a/dylint/Cargo.toml +++ b/dylint/Cargo.toml @@ -9,34 +9,34 @@ repository = "https://github.com/trailofbits/dylint" rust-version = "1.78" [dependencies] -ansi_term = "0.12" -anyhow = "1.0" +ansi_term = { workspace = true } +anyhow = { workspace = true } # smoelius: The `cargo` dependency should be kept in sync with: dylint/src/library_packages/cargo_lib/toml/mod.rs -cargo = { version = "0.81", optional = true } -cargo-platform = { version = "0.1", optional = true } -cargo-util = { version = "0.2", optional = true } -cargo-util-schemas = { version = "0.7", optional = true } -cargo_metadata = "0.19" -dirs = "5.0" -dunce = { version = "1.0", optional = true } -fs_extra = { version = "1.3", optional = true } -glob = { version = "0.3", optional = true } -heck = { version = "0.5", optional = true } -hex = { version = "0.4", optional = true } -home = { version = "0.5", optional = true } -if_chain = { version = "1.0", optional = true } -is-terminal = "0.4" -log = "0.4" -once_cell = "1.20" -rewriter = { version = "0.1", optional = true } -semver = "1.0" -serde = "1.0" -serde-untagged = { version = "0.1", optional = true } -serde_json = "1.0" -tempfile = "3.14" -toml = { version = "0.8", optional = true } -url = { version = "2.5", optional = true } -walkdir = "2.5" +cargo = { workspace = true, optional = true } +cargo-platform = { workspace = true, optional = true } +cargo-util = { workspace = true, optional = true } +cargo-util-schemas = { workspace = true, optional = true } +cargo_metadata = { workspace = true } +dirs = { workspace = true } +dunce = { workspace = true, optional = true } +fs_extra = { workspace = true, optional = true } +glob = { workspace = true, optional = true } +heck = { workspace = true, optional = true } +hex = { workspace = true, optional = true } +home = { workspace = true, optional = true } +if_chain = { workspace = true, optional = true } +is-terminal = { workspace = true } +log = { workspace = true } +once_cell = { workspace = true } +rewriter = { workspace = true, optional = true } +semver = { workspace = true } +serde = { workspace = true } +serde-untagged = { workspace = true, optional = true } +serde_json = { workspace = true } +tempfile = { workspace = true } +toml = { workspace = true, optional = true } +url = { workspace = true, optional = true } +walkdir = { workspace = true } dylint_internal = { version = "=3.3.0", path = "../internal", features = [ "config", @@ -52,7 +52,7 @@ dylint_internal = { version = "=3.3.0", path = "../internal", features = [ ] } [dev-dependencies] -env_logger = "0.11" +env_logger = { workspace = true } dylint_internal = { version = "=3.3.0", path = "../internal", features = [ "examples", diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 8d84e613e..56b4d32f7 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -7,10 +7,10 @@ license = "MIT OR Apache-2.0" publish = false [dev-dependencies] -cargo-util = "0.2" -cargo_metadata = "0.19" -toml_edit = "0.22" -walkdir = "2.5" +cargo-util = { workspace = true } +cargo_metadata = { workspace = true } +toml_edit = { workspace = true } +walkdir = { workspace = true } dylint_internal = { version = "=3.3.0", path = "../internal", features = [ "clippy_utils", diff --git a/examples/general/Cargo.toml b/examples/general/Cargo.toml index 2b072be97..89f0b9cd7 100644 --- a/examples/general/Cargo.toml +++ b/examples/general/Cargo.toml @@ -46,7 +46,14 @@ members = [ ] [workspace.dependencies] +bitflags = "2.6" clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "ff4a26d442bead94a4c96fb1de967374bc4fbd8e" } +derivative = "2.2.0" +home = "0.5" +once_cell = "1.20" +serde = "1.0" +serde_json = "1.0" +tracing = "0.1" [workspace.lints.rust.unexpected_cfgs] level = "deny" diff --git a/examples/general/abs_home_path/Cargo.toml b/examples/general/abs_home_path/Cargo.toml index 6c7b81831..ca8e977d4 100644 --- a/examples/general/abs_home_path/Cargo.toml +++ b/examples/general/abs_home_path/Cargo.toml @@ -11,8 +11,8 @@ crate-type = ["cdylib", "rlib"] [dependencies] clippy_utils = { workspace = true } -home = "0.5" -once_cell = "1.20" +home = { workspace = true } +once_cell = { workspace = true } dylint_internal = { path = "../../../internal" } dylint_linting = { path = "../../../utils/linting" } diff --git a/examples/general/await_holding_span_guard/Cargo.toml b/examples/general/await_holding_span_guard/Cargo.toml index a5e15c6d9..10d065741 100644 --- a/examples/general/await_holding_span_guard/Cargo.toml +++ b/examples/general/await_holding_span_guard/Cargo.toml @@ -19,7 +19,7 @@ clippy_utils = { workspace = true } dylint_linting = { path = "../../../utils/linting" } [dev-dependencies] -tracing = "0.1" +tracing = { workspace = true } dylint_testing = { path = "../../../utils/testing" } diff --git a/examples/general/non_local_effect_before_error_return/Cargo.toml b/examples/general/non_local_effect_before_error_return/Cargo.toml index 8f6d1d435..67b660b7d 100644 --- a/examples/general/non_local_effect_before_error_return/Cargo.toml +++ b/examples/general/non_local_effect_before_error_return/Cargo.toml @@ -19,14 +19,14 @@ path = "ui_public_only/main.rs" [dependencies] clippy_utils = { workspace = true } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true, features = ["derive"] } dylint_linting = { path = "../../../utils/linting" } [dev-dependencies] -bitflags = "2.6" -derivative = "2.2.0" -once_cell = "1.20" +bitflags = { workspace = true } +derivative = { workspace = true } +once_cell = { workspace = true } dylint_testing = { path = "../../../utils/testing" } diff --git a/examples/general/wrong_serialize_struct_arg/Cargo.toml b/examples/general/wrong_serialize_struct_arg/Cargo.toml index 9d6bba7e5..ca1f6c349 100644 --- a/examples/general/wrong_serialize_struct_arg/Cargo.toml +++ b/examples/general/wrong_serialize_struct_arg/Cargo.toml @@ -20,8 +20,8 @@ dylint_internal = { path = "../../../internal" } dylint_linting = { path = "../../../utils/linting" } [dev-dependencies] -serde = "1.0" -serde_json = "1.0" +serde = { workspace = true } +serde_json = { workspace = true } dylint_testing = { path = "../../../utils/testing" } diff --git a/examples/restriction/Cargo.toml b/examples/restriction/Cargo.toml index 113daa2ab..52407682d 100644 --- a/examples/restriction/Cargo.toml +++ b/examples/restriction/Cargo.toml @@ -16,7 +16,20 @@ members = [ resolver = "2" [workspace.dependencies] +anyhow = "1.0" +assert_cmd = "2.0" +camino = "1.1" +cargo_metadata = "0.18" clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "ff4a26d442bead94a4c96fb1de967374bc4fbd8e" } +diesel = "2.2" +git2 = "0.18" +heck = "0.5" +once_cell = "1.20" +serde = "1.0" +serde_json = "1.0" +tempfile = "3.14" +thiserror = "2.0" +toml = "0.8" [workspace.lints.rust.unexpected_cfgs] level = "deny" diff --git a/examples/restriction/collapsible_unwrap/Cargo.toml b/examples/restriction/collapsible_unwrap/Cargo.toml index d48961cfb..27e38588d 100644 --- a/examples/restriction/collapsible_unwrap/Cargo.toml +++ b/examples/restriction/collapsible_unwrap/Cargo.toml @@ -15,12 +15,12 @@ path = "ui/main.rs" [dependencies] clippy_utils = { workspace = true } -heck = "0.5" +heck = { workspace = true } dylint_linting = { path = "../../../utils/linting" } [dev-dependencies] -toml = "0.8" +toml = { workspace = true } dylint_testing = { path = "../../../utils/testing" } diff --git a/examples/restriction/const_path_join/Cargo.toml b/examples/restriction/const_path_join/Cargo.toml index fa7c395e7..9bbca6188 100644 --- a/examples/restriction/const_path_join/Cargo.toml +++ b/examples/restriction/const_path_join/Cargo.toml @@ -20,7 +20,7 @@ dylint_internal = { path = "../../../internal" } dylint_linting = { path = "../../../utils/linting" } [dev-dependencies] -camino = "1.1" +camino = { workspace = true } dylint_testing = { path = "../../../utils/testing" } diff --git a/examples/restriction/inconsistent_qualification/Cargo.toml b/examples/restriction/inconsistent_qualification/Cargo.toml index 99a633c62..97437f70f 100644 --- a/examples/restriction/inconsistent_qualification/Cargo.toml +++ b/examples/restriction/inconsistent_qualification/Cargo.toml @@ -19,7 +19,7 @@ clippy_utils = { workspace = true } dylint_linting = { path = "../../../utils/linting" } [dev-dependencies] -diesel = "2.2" +diesel = { workspace = true } dylint_testing = { path = "../../../utils/testing" } diff --git a/examples/restriction/misleading_variable_name/Cargo.toml b/examples/restriction/misleading_variable_name/Cargo.toml index 279ae8e8d..96a674b00 100644 --- a/examples/restriction/misleading_variable_name/Cargo.toml +++ b/examples/restriction/misleading_variable_name/Cargo.toml @@ -15,13 +15,13 @@ path = "ui/main.rs" [dependencies] clippy_utils = { workspace = true } -heck = "0.5" +heck = { workspace = true } dylint_linting = { path = "../../../utils/linting" } [dev-dependencies] -anyhow = "1.0" -cargo_metadata = "0.18" +anyhow = { workspace = true } +cargo_metadata = { workspace = true } dylint_testing = { path = "../../../utils/testing" } diff --git a/examples/restriction/overscoped_allow/Cargo.toml b/examples/restriction/overscoped_allow/Cargo.toml index cca243036..11eede27c 100644 --- a/examples/restriction/overscoped_allow/Cargo.toml +++ b/examples/restriction/overscoped_allow/Cargo.toml @@ -18,19 +18,19 @@ name = "ui_test" path = "ui_test/main.rs" [dependencies] -anyhow = "1.0" -cargo_metadata = "0.18" +anyhow = { workspace = true } +cargo_metadata = { workspace = true } clippy_utils = { workspace = true } -once_cell = "1.20" -serde = "1.0" -serde_json = "1.0" +once_cell = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } dylint_internal = { path = "../../../internal" } dylint_linting = { path = "../../../utils/linting" } [dev-dependencies] -assert_cmd = "2.0" -tempfile = "3.14" +assert_cmd = { workspace = true } +tempfile = { workspace = true } dylint_testing = { path = "../../../utils/testing" } diff --git a/examples/restriction/question_mark_in_expression/Cargo.toml b/examples/restriction/question_mark_in_expression/Cargo.toml index eb3893a13..527e6d965 100644 --- a/examples/restriction/question_mark_in_expression/Cargo.toml +++ b/examples/restriction/question_mark_in_expression/Cargo.toml @@ -31,8 +31,8 @@ clippy_utils = { workspace = true } dylint_linting = { path = "../../../utils/linting" } [dev-dependencies] -git2 = "0.18" -tempfile = "3.14" +git2 = { workspace = true } +tempfile = { workspace = true } dylint_testing = { path = "../../../utils/testing" } diff --git a/examples/restriction/suboptimal_pattern/Cargo.toml b/examples/restriction/suboptimal_pattern/Cargo.toml index fa53bc7b9..708cb210e 100644 --- a/examples/restriction/suboptimal_pattern/Cargo.toml +++ b/examples/restriction/suboptimal_pattern/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib"] [dependencies] clippy_utils = { workspace = true } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true, features = ["derive"] } dylint_linting = { path = "../../../utils/linting" } diff --git a/examples/restriction/try_io_result/Cargo.toml b/examples/restriction/try_io_result/Cargo.toml index 110a0bef7..7afe53151 100644 --- a/examples/restriction/try_io_result/Cargo.toml +++ b/examples/restriction/try_io_result/Cargo.toml @@ -20,8 +20,8 @@ dylint_internal = { path = "../../../internal" } dylint_linting = { path = "../../../utils/linting" } [dev-dependencies] -anyhow = "1.0" -thiserror = "2.0" +anyhow = { workspace = true } +thiserror = { workspace = true } dylint_testing = { path = "../../../utils/testing" } diff --git a/examples/supplementary/Cargo.toml b/examples/supplementary/Cargo.toml index d588773fd..0b86c3c20 100644 --- a/examples/supplementary/Cargo.toml +++ b/examples/supplementary/Cargo.toml @@ -43,7 +43,15 @@ members = [ ] [workspace.dependencies] +cargo-util = "0.2" +cargo_metadata = "0.18" clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "ff4a26d442bead94a4c96fb1de967374bc4fbd8e" } +once_cell = "1.20" +pulldown-cmark = "0.10" +regex = "1.11" +serde = "1.0" +syn = "2.0" +tempfile = "3.14" [workspace.lints.rust.unexpected_cfgs] level = "deny" diff --git a/examples/supplementary/commented_code/Cargo.toml b/examples/supplementary/commented_code/Cargo.toml index 71da5ce48..9ed924599 100644 --- a/examples/supplementary/commented_code/Cargo.toml +++ b/examples/supplementary/commented_code/Cargo.toml @@ -11,9 +11,9 @@ crate-type = ["cdylib", "rlib"] [dependencies] clippy_utils = { workspace = true } -once_cell = "1.20" -regex = "1.11" -syn = { version = "2.0", features = ["full"] } +once_cell = { workspace = true } +regex = { workspace = true } +syn = { workspace = true, features = ["full"] } dylint_linting = { path = "../../../utils/linting" } diff --git a/examples/supplementary/escaping_doc_link/Cargo.toml b/examples/supplementary/escaping_doc_link/Cargo.toml index e3b27df2f..d2b003761 100644 --- a/examples/supplementary/escaping_doc_link/Cargo.toml +++ b/examples/supplementary/escaping_doc_link/Cargo.toml @@ -10,11 +10,11 @@ publish = false crate-type = ["cdylib", "rlib"] [dependencies] -cargo-util = "0.2" -cargo_metadata = "0.18" +cargo-util = { workspace = true } +cargo_metadata = { workspace = true } clippy_utils = { workspace = true } -once_cell = "1.20" -pulldown-cmark = "0.10" +once_cell = { workspace = true } +pulldown-cmark = { workspace = true } dylint_linting = { path = "../../../utils/linting" } diff --git a/examples/supplementary/redundant_reference/Cargo.toml b/examples/supplementary/redundant_reference/Cargo.toml index 9c67e8333..58ebfbccc 100644 --- a/examples/supplementary/redundant_reference/Cargo.toml +++ b/examples/supplementary/redundant_reference/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib", "rlib"] [dependencies] clippy_utils = { workspace = true } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true, features = ["derive"] } dylint_linting = { path = "../../../utils/linting" } diff --git a/examples/supplementary/unnamed_constant/Cargo.toml b/examples/supplementary/unnamed_constant/Cargo.toml index a6b55f52f..c77b3164c 100644 --- a/examples/supplementary/unnamed_constant/Cargo.toml +++ b/examples/supplementary/unnamed_constant/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib", "rlib"] [dependencies] clippy_utils = { workspace = true } -serde = "1.0" +serde = { workspace = true } dylint_linting = { path = "../../../utils/linting" } diff --git a/examples/supplementary/unnecessary_conversion_for_trait/Cargo.toml b/examples/supplementary/unnecessary_conversion_for_trait/Cargo.toml index edfe023c0..858f982e4 100644 --- a/examples/supplementary/unnecessary_conversion_for_trait/Cargo.toml +++ b/examples/supplementary/unnecessary_conversion_for_trait/Cargo.toml @@ -28,7 +28,7 @@ dylint_internal = { path = "../../../internal", features = ["cargo"] } dylint_linting = { path = "../../../utils/linting" } [dev-dependencies] -tempfile = "3.14" +tempfile = { workspace = true } dylint_testing = { path = "../../../utils/testing" } diff --git a/expensive/Cargo.toml b/expensive/Cargo.toml index c9a2eef49..a3a86c070 100644 --- a/expensive/Cargo.toml +++ b/expensive/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" publish = false [dev-dependencies] -anyhow = "1.0" -tempfile = "3.14" +anyhow = { workspace = true } +tempfile = { workspace = true } dylint_internal = { version = "=3.3.0", path = "../internal", features = [ "clippy_utils", diff --git a/internal/Cargo.toml b/internal/Cargo.toml index 6938cbda4..c56e1d0b2 100644 --- a/internal/Cargo.toml +++ b/internal/Cargo.toml @@ -8,33 +8,31 @@ license = "MIT OR Apache-2.0" repository = "https://github.com/trailofbits/dylint" [dependencies] -anyhow = "1.0" -once_cell = "1.20" -regex = "1.11" +anyhow = { workspace = true } +once_cell = { workspace = true } +regex = { workspace = true } -ansi_term = { version = "0.12", optional = true } -bitflags = { version = "2.6", optional = true } -cargo-util = { version = "0.2", optional = true } -cargo_metadata = { version = "0.19", optional = true } -ctor = { version = "0.2", optional = true } -env_logger = { version = "0.11", optional = true } -git2 = { version = "0.18", optional = true } -home = { version = "0.5", optional = true } -if_chain = { version = "1.0", optional = true } -is-terminal = { version = "0.4", optional = true } -log = { version = "0.4", optional = true } -rust-embed = { version = "8.5", features = [ - "include-exclude", -], optional = true } -semver = { version = "1.0", optional = true } -serde = { version = "1.0", optional = true } -thiserror = { version = "2.0", optional = true } -toml = { version = "0.8", optional = true } -toml_edit = { version = "0.22", optional = true } -walkdir = { version = "2.5", optional = true } +ansi_term = { workspace = true, optional = true } +bitflags = { workspace = true, optional = true } +cargo-util = { workspace = true, optional = true } +cargo_metadata = { workspace = true, optional = true } +ctor = { workspace = true, optional = true } +env_logger = { workspace = true, optional = true } +git2 = { workspace = true, optional = true } +home = { workspace = true, optional = true } +if_chain = { workspace = true, optional = true } +is-terminal = { workspace = true, optional = true } +log = { workspace = true, optional = true } +rust-embed = { workspace = true, features = ["include-exclude"], optional = true } +semver = { workspace = true, optional = true } +serde = { workspace = true, optional = true } +thiserror = { workspace = true, optional = true } +toml = { workspace = true, optional = true } +toml_edit = { workspace = true, optional = true } +walkdir = { workspace = true, optional = true } [dev-dependencies] -toml_edit = "0.22" +toml_edit = { workspace = true } [features] cargo = [ diff --git a/utils/testing/Cargo.toml b/utils/testing/Cargo.toml index 06a375f4b..623a3b142 100644 --- a/utils/testing/Cargo.toml +++ b/utils/testing/Cargo.toml @@ -8,14 +8,14 @@ license = "MIT OR Apache-2.0" repository = "https://github.com/trailofbits/dylint" [dependencies] -anyhow = "1.0" -cargo_metadata = "0.19" -compiletest_rs = "0.11" -env_logger = "0.11" -once_cell = "1.20" -regex = "1.11" -serde_json = "1.0" -tempfile = "3.14" +anyhow = { workspace = true } +cargo_metadata = { workspace = true } +compiletest_rs = { workspace = true } +env_logger = { workspace = true } +once_cell = { workspace = true } +regex = { workspace = true } +serde_json = { workspace = true } +tempfile = { workspace = true } dylint = { version = "=3.3.0", path = "../../dylint" } dylint_internal = { version = "=3.3.0", path = "../../internal" }