catchup 2

githedgehog · Dec 1, 2024 · 14441b7 · 14441b7
1 parent a4a49e9
commit 14441b7
Show file tree

Hide file tree

Showing 8 changed files with 133 additions and 192 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,17 +11,22 @@ resolver = "2"
 
 [workspace.dependencies]
 
-bindgen = { version = "0.70.1" }
-bolero = { version = "=0.10.1" } # TODO: update as soon as resolution bug with 0.11 or better is fixed
+# internal deps
+dpdk-sys = { path = "./dpdk-sys" }
+dpdk = { path = "./dpdk" }
+dpdk-sysroot-helper = { path = "./dpdk-sysroot-helper" }
+errno = { path = "./errno" }
+net = { path = "./net" }
+
+# external deps
+bindgen = { version = "0.70.1", default-features = false }
+bitflags = { version = "2.6.0", default-features = false }
+bolero = { version = "0.12.0", default-features = false, features = ["alloc"] }
 criterion = { version = "0.5.1", default-features = true }
-doxygen-rs = { version = "0.4.0" }
+doxygen-rs = { version = "0.4.0", default-features = false }
 etherparse = { version = "0.16.0", default-features = false, features = [] }
 rand = { version = "0.8.5", default-features = false, features = [] }
-rstest = { version = "0.23.0", default-features = false, features = [] }
 serde = { version = "1.0.213", default-features = false, features = ["derive", "alloc", "rc"] }
 thiserror = { version = "2.0.2", default-features = false }
 tracing = { version = "0.1.40", default-features = false, features = ["attributes"] }
-tracing-subscriber = { version = "0.3.18" }
-tracing-test = { version = "0.2.5" }
-bitflags = { version = "2.6.0", default-features = false  }
-
+tracing-subscriber = { version = "0.3.18", default-features = false }
diff --git a/dpdk-sys/Cargo.toml b/dpdk-sys/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.0.1"
 edition = "2021"
 description = "Low-level bindings to the Data Plane Development Kit (DPDK)"
 publish = false
+resolver = "2"
 
 [lib]
 crate-type = ["rlib"]

diff --git a/dpdk/Cargo.toml b/dpdk/Cargo.toml
@@ -3,6 +3,7 @@ name = "dpdk"
 version = "0.1.0"
 edition = "2021"
 publish = false
+resolver = "2"
 
 [features]
 default = ["serde", "tracing_max_level_trace", "tracing_release_max_level_debug"]
@@ -24,15 +25,14 @@ tracing_release_max_level_warn = ["tracing/release_max_level_warn"]
 
 [dependencies]
 
-dpdk-sys = { path = "../dpdk-sys" }
-errno = { path = "../errno" }
-net = { path = "../net" }
+dpdk-sys = { workspace = true }
+errno = { workspace = true }
+net = { workspace = true }
 
-etherparse = { workspace = true, default-features = false, features = [] }
 serde = { workspace = true, optional = true }
 thiserror = { workspace = true }
 tracing = { workspace = true, features = ["attributes"] }
 bitflags = { workspace = true }
 
 [build-dependencies]
-dpdk-sysroot-helper = { path = "../dpdk-sysroot-helper" }
+dpdk-sysroot-helper = { workspace = true }
diff --git a/dpdk/src/dev.rs b/dpdk/src/dev.rs
@@ -3,10 +3,9 @@
 
 //! Ethernet device management.
 
-use bitflags::*;
-
 use alloc::format;
 use alloc::vec::Vec;
+use bitflags::*;
 use core::ffi::{c_uint, CStr};
 use core::fmt::{Debug, Display, Formatter};
 use core::marker::PhantomData;

diff --git a/errno/Cargo.toml b/errno/Cargo.toml
@@ -3,6 +3,7 @@ name = "errno"
 version = "0.1.0"
 edition = "2021"
 publish = false
+resolver = "2"
 
 [dependencies]
 

diff --git a/net/Cargo.toml b/net/Cargo.toml
@@ -3,6 +3,7 @@ name = "net"
 version = "0.0.1"
 edition = "2021"
 publish = false
+resolver = "2"
 
 [[bench]]
 name = "parse"

diff --git a/scratch/Cargo.toml b/scratch/Cargo.toml
@@ -3,15 +3,18 @@ name = "scratch"
 version = "0.1.0"
 edition = "2021"
 publish = false
+resolver = "2"
 
 [dependencies]
-dpdk-sys = { path = "../dpdk-sys" }
-dpdk = { path = "../dpdk" }
 
-rand = { version = "0.8.5" }
-thiserror = { workspace = true }
+# internal
+dpdk-sys = { workspace = true }
+dpdk = { workspace = true }
+
+# external
+rand = { version = "0.8.5", default-features = true } # non-workspace to prevent pulling in std in other crates
 tracing = { workspace = true, features = ["attributes"] }
-tracing-subscriber = { workspace = true }
+tracing-subscriber = { workspace = true, features = ["fmt"] }
 
 [build-dependencies]
-dpdk-sysroot-helper = { path = "../dpdk-sysroot-helper" }
+dpdk-sysroot-helper = { workspace = true }