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

Don't use workspace dependencies #2652

Merged
merged 13 commits into from
Nov 4, 2024
Merged
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
3 changes: 2 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
version: 2
updates:
- package-ecosystem: "cargo"
directory: "/"
directories:
- "*"
schedule:
interval: "daily"
37 changes: 0 additions & 37 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,43 +49,6 @@ exclude = [
[workspace.package]
version = "0.13.2"

[workspace.dependencies]
ahash = { version = "0.8.11", default-features = false } # The hash function already used in hashbrown
backtrace = { version = "0.3.74", default-features = false } # Used to get the stacktrace in StacktraceObserver
bindgen = "0.70.1"
clap = "4.5.18"
cc = "1.1.21"
cmake = "0.1.51"
document-features = "0.2.10"
hashbrown = { version = "0.14.5", default-features = false } # A faster hashmap, nostd compatible
libc = "0.2.159" # For (*nix) libc
log = "0.4.22"
meminterval = "0.4.1"
mimalloc = { version = "0.1.43", default-features = false }
nix = { version = "0.29.0", default-features = false }
num_enum = { version = "0.7.3", default-features = false }
num-traits = { version = "0.2.19", default-features = false }
paste = "1.0.15"
postcard = { version = "1.0.10", features = [
"alloc",
], default-features = false } # no_std compatible serde serialization format
rangemap = "1.5.1"
regex = "1.10.6"
rustversion = "1.0.17"
serde = { version = "1.0.210", default-features = false } # serialization lib
serial_test = { version = "3.1.1", default-features = false }
serde_json = { version = "1.0.128", default-features = false }
serde_yaml = { version = "0.9.34" } # For parsing the injections yaml file
strum = "0.26.3"
strum_macros = "0.26.4"
toml = "0.8.19" # For parsing the injections toml file
typed-builder = "0.20.0" # Implement the builder pattern at compiletime
uuid = { version = "1.10.0", features = ["serde", "v4"] }
which = "6.0.3"
windows = "0.58.0"
z3 = "0.12.1"


[workspace.lints.rust]
# Forbid
unexpected_cfgs = "forbid"
Expand Down
2 changes: 1 addition & 1 deletion fuzzers/baby/tutorial/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ debug = true

[build-dependencies]
cc = { version = "1.1.21", features = ["parallel"] }
which = "6.0.3"
which = { version = "7.0.0" }

[dependencies]
libafl = { path = "../../../libafl", features = ["default", "rand_trait"] }
Expand Down
2 changes: 1 addition & 1 deletion fuzzers/forkserver/forkserver_libafl_cc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ debug = true

[build-dependencies]
cc = { version = "1.1.21", features = ["parallel"] }
which = { version = "6.0.3" }
which = { version = "7.0.0" }

[dependencies]
clap = { version = "4.5.18", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion fuzzers/forkserver/fuzzbench_forkserver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ strip = true

[build-dependencies]
cc = { version = "1.1.22", features = ["parallel"] }
which = "6.0.3"
which = { version = "7.0.0" }

[dependencies]
libafl = { path = "../../../libafl" }
Expand Down
2 changes: 1 addition & 1 deletion fuzzers/forkserver/fuzzbench_forkserver_cmplog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ strip = true

[build-dependencies]
cc = { version = "1.1.21", features = ["parallel"] }
which = "6.0.3"
which = { version = "7.0.0" }

[dependencies]
libafl = { path = "../../../libafl" }
Expand Down
2 changes: 1 addition & 1 deletion fuzzers/fuzz_anything/libafl_atheris/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ debug = true

[build-dependencies]
cc = { version = "1.1.21", features = ["parallel"] }
which = "6.0.3"
which = { version = "7.0.0" }

[dependencies]
libafl = { path = "../../../libafl" }
Expand Down
2 changes: 1 addition & 1 deletion fuzzers/inprocess/dynamic_analysis/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ strip = true

[build-dependencies]
cc = { version = "1.1.21", features = ["parallel"] }
which = "6.0.3"
which = { version = "7.0.0" }

[dependencies]
env_logger = "0.11.5"
Expand Down
2 changes: 1 addition & 1 deletion fuzzers/inprocess/fuzzbench/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ strip = true

[build-dependencies]
cc = { version = "1.0.106", features = ["parallel"] }
which = "6.0.3"
which = { version = "7.0.0" }

[dependencies]
libafl = { path = "../../../libafl" }
Expand Down
2 changes: 1 addition & 1 deletion fuzzers/inprocess/fuzzbench_ctx/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ strip = true

[build-dependencies]
cc = { version = "1.1.21", features = ["parallel"] }
which = "6.0.3"
which = { version = "7.0.0" }

[dependencies]
libafl = { path = "../../../libafl" }
Expand Down
2 changes: 1 addition & 1 deletion fuzzers/inprocess/fuzzbench_text/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ debug = true

[build-dependencies]
cc = { version = "1.1.21", features = ["parallel"] }
which = "6.0.3"
which = { version = "7.0.0" }

[dependencies]
libafl = { path = "../../../libafl" }
Expand Down
2 changes: 1 addition & 1 deletion fuzzers/inprocess/libfuzzer_libpng/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ debug = true

[build-dependencies]
cc = { version = "1.1.21", features = ["parallel"] }
which = "6.0.3"
which = { version = "7.0.0" }

[dependencies]
libafl = { path = "../../../libafl", features = ["default"] }
Expand Down
2 changes: 1 addition & 1 deletion fuzzers/inprocess/libfuzzer_libpng_accounting/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ debug = true

[build-dependencies]
cc = { version = "1.1.21", features = ["parallel"] }
which = "6.0.3"
which = { version = "7.0.0" }

[dependencies]
libafl = { path = "../../../libafl", features = [
Expand Down
2 changes: 1 addition & 1 deletion fuzzers/inprocess/libfuzzer_libpng_centralized/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ debug = true

[build-dependencies]
cc = { version = "1.1.21", features = ["parallel"] }
which = "6.0.3"
which = { version = "7.0.0" }

[dependencies]
libafl = { path = "../../../libafl", features = [
Expand Down
2 changes: 1 addition & 1 deletion fuzzers/inprocess/libfuzzer_libpng_cmin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ debug = true

[build-dependencies]
cc = { version = "1.1.21", features = ["parallel"] }
which = "6.0.3"
which = { version = "7.0.0" }

[dependencies]
libafl = { path = "../../../libafl", features = ["default", "cmin"] }
Expand Down
2 changes: 1 addition & 1 deletion fuzzers/inprocess/libfuzzer_libpng_launcher/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ debug = true

[build-dependencies]
cc = { version = "1.1.21", features = ["parallel"] }
which = "6.0.3"
which = { version = "7.0.0" }

[dependencies]
libafl = { path = "../../../libafl", features = [
Expand Down
2 changes: 1 addition & 1 deletion fuzzers/inprocess/libfuzzer_libpng_norestart/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ debug = true

[build-dependencies]
cc = { version = "1.1.21", features = ["parallel"] }
which = "6.0.3"
which = { version = "7.0.0" }

[dependencies]
env_logger = "0.11.5"
Expand Down
2 changes: 1 addition & 1 deletion fuzzers/inprocess/libfuzzer_libpng_tcp_manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ debug = true

[build-dependencies]
cc = { version = "1.1.21", features = ["parallel"] }
which = "6.0.3"
which = { version = "7.0.0" }

[dependencies]
libafl = { path = "../../../libafl", features = ["default", "tcp_manager"] }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ debug = true

[build-dependencies]
cc = { version = "1.1.21", features = ["parallel"] }
which = "6.0.3"
which = { version = "7.0.0" }

[dependencies]
# no llmp compression for now, better perfs.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ mimalloc = { version = "0.1.43", default-features = false }
[build-dependencies]
cc = { version = "1.1.22", features = ["parallel"] }
cmake = "0.1.51"
which = "6.0.3"
which = { version = "7.0.0" }
symcc_libafl = { path = "../../../../libafl_concolic/symcc_libafl" }
50 changes: 27 additions & 23 deletions libafl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ nautilus = [
rustversion = "1.0.17"

[dev-dependencies]
serde_json = { workspace = true, default-features = false, features = [
serde_json = { version = "1.0.128", default-features = false, features = [
"alloc",
] }
# clippy-suggested optimised byte counter
Expand All @@ -201,28 +201,32 @@ libafl_bolts = { version = "0.13.2", path = "../libafl_bolts", default-features
] }
libafl_derive = { version = "0.13.2", path = "../libafl_derive", optional = true }

rustversion = { workspace = true }
rustversion = { version = "1.0.17" }
tuple_list = { version = "0.1.3" }
hashbrown = { workspace = true, features = [
hashbrown = { version = "0.15.0", features = [
"serde",
"ahash",
"default-hasher",
], default-features = false } # A faster hashmap, nostd compatible
num-traits = { workspace = true, default-features = false }
serde = { workspace = true, features = ["alloc"] } # serialization lib
postcard = { workspace = true } # no_std compatible serde serialization format
num-traits = { version = "0.2.19", default-features = false }
serde = { version = "1.0.210", default-features = false, features = [
"alloc",
] } # serialization lib
postcard = { version = "1.0.10", features = [
"alloc",
], default-features = false } # no_std compatible serde serialization format
bincode = { version = "1.3.3", optional = true }
c2rust-bitfields = { version = "0.19.0", features = ["no_std"] }
ahash = { workspace = true } # The hash function already used in hashbrown
meminterval = { workspace = true, features = ["serde"] }
backtrace = { workspace = true, optional = true } # Used to get the stacktrace in StacktraceObserver
typed-builder = { workspace = true, optional = true } # Implement the builder pattern at compiletime
ahash = { version = "0.8.11", default-features = false } # The hash function already used in hashbrown
meminterval = { version = "0.4.1", features = ["serde"] }
backtrace = { version = "0.3.74", default-features = false, optional = true } # Used to get the stacktrace in StacktraceObserver
typed-builder = { version = "0.20.0", optional = true } # Implement the builder pattern at compiletime

serde_json = { workspace = true, optional = true, default-features = false, features = [
serde_json = { version = "1.0.128", optional = true, default-features = false, features = [
"alloc",
] }
nix = { workspace = true, default-features = true, optional = true }
regex = { workspace = true, optional = true }
uuid = { workspace = true, optional = true, features = ["serde", "v4"] }
nix = { version = "0.29.0", default-features = true, optional = true }
regex = { version = "1.10.6", optional = true }
uuid = { version = "1.10.0", optional = true, features = ["serde", "v4"] }
libm = "0.2.8"
ratatui = { version = "0.28.1", default-features = false, features = [
'crossterm',
Expand All @@ -233,7 +237,7 @@ prometheus-client = { version = "0.22.3", optional = true } # For the prometheus
tide = { version = "0.16.0", optional = true }
async-std = { version = "1.13.0", features = ["attributes"], optional = true }
futures = { version = "0.3.30", optional = true }
log = { workspace = true }
log = { version = "0.4.22" }
tokio = { version = "1.40.0", optional = true, features = [
"sync",
"net",
Expand Down Expand Up @@ -264,24 +268,24 @@ pyo3 = { version = "0.22.3", features = ["gil-refs"], optional = true }
regex-syntax = { version = "0.8.4", optional = true } # For nautilus

# optional-dev deps (change when target.'cfg(accessible(::std))'.test-dependencies will be stable)
serial_test = { workspace = true, optional = true, default-features = false, features = [
serial_test = { version = "3.1.1", optional = true, default-features = false, features = [
"logging",
] }

# Document all features of this crate (for `cargo doc`)
document-features = { workspace = true, optional = true }
document-features = { version = "0.2.10", optional = true }
# Optional
clap = { workspace = true, optional = true }
clap = { version = "4.5.18", optional = true }

[lints]
workspace = true

[target.'cfg(unix)'.dependencies]
libc = { workspace = true } # For (*nix) libc
z3 = { workspace = true, optional = true } # for concolic mutation
libc = { version = "0.2.59" } # For (*nix) libc
z3 = { version = "0.12.1", optional = true } # for concolic mutation

[target.'cfg(windows)'.dependencies]
windows = { workspace = true, features = [
windows = { version = "0.58.0", features = [
"Win32_Foundation",
"Win32_System_Threading",
"Win32_System_Diagnostics_Debug",
Expand All @@ -292,4 +296,4 @@ windows = { workspace = true, features = [
] }

[target.'cfg(windows)'.build-dependencies]
windows = { workspace = true }
windows = { version = "0.58.0" }
Loading
Loading