fixup clippy

.cargo/config.toml

@@ -1,7 +1,5 @@
 [env]
 COMPILE_ENV = { value = "compile-env", relative = true, force = false }
-SYSROOT = { value = "compile-env/sysroot", relative = true, force = false }
-
 PATH = { value = "compile-env/bin", relative = true, force = true }
 LD_LIBRARY_PATH = { value = "compile-env/lib", relative = true, force = true }
 LIBCLANG_PATH = { value = "compile-env/lib", relative = true, force = true }

.github/workflows/build-and-deploy-docs.yml

@@ -46,10 +46,6 @@ jobs:
               - 'design-docs/**'
               - 'nix/**'
               - '.github/workflows/build-and-deploy-docs.yml'
-      - uses: cargo-bins/cargo-binstall@main
-      - run: cargo binstall --no-confirm just
-      - run: cargo binstall --no-confirm cargo-deny
-      - run: just cargo deny check
 
   build:
     name: "Build and deploy documentation"

design-docs/src/mdbook/book.toml

@@ -6,9 +6,7 @@ src = "src"
 title = "Hedgehog Dataplane Design Notes"
 
 [preprocessor.plantuml]
-plantuml-cmd = "plantuml"
 after = ["links"]
-use-data-uris = false
 
 [preprocessor.mermaid]
 after = ["links"]

dpdk-sysroot-helper/src/lib.rs

@@ -33,7 +33,8 @@ pub fn get_compile_env() -> String {
 }
 
 pub fn get_sysroot() -> String {
-    let sysroot_env = env::var("SYSROOT").expect("sysroot env not set");
+    let compile_env = env::var("COMPILE_ENV").expect("COMPILE_ENV not set");
+    let sysroot_env = format!("{compile_env}/sysroot");
     let target = get_target_name();
     let profile = get_profile_name();
     let expected_sysroot = format!("{sysroot_env}/{target}/{profile}");

justfile

@@ -38,8 +38,7 @@ profile := "dev"
 _container_repo := "ghcr.io/githedgehog/dataplane"
 rust := "stable"
 _dpdk_sys_container_repo := "ghcr.io/githedgehog/dpdk-sys"
-_env_branch := "main"
-_dpdk_sys_container_tag := _env_branch + "-rust-" + rust + "-" + dpdk_sys_commit
+_dpdk_sys_container_tag := dpdk_sys_commit + "-rust-" + rust
 _dev_env_container := _dpdk_sys_container_repo + "/dev-env:" + _dpdk_sys_container_tag
 _doc_env_container := _dpdk_sys_container_repo + "/doc-env:" + _dpdk_sys_container_tag
 _compile_env_container := _dpdk_sys_container_repo + "/compile-env:" + _dpdk_sys_container_tag
@@ -479,7 +478,6 @@ mdbook *args="build":
     cd ./design-docs/src/mdbook
     docker run \
       --rm \
-      -it \
       --init \
       --volume "$(pwd):$(pwd)" \
       --user "$(id -u):$(id -g)" \

scratch/Cargo.toml

@@ -8,11 +8,10 @@ publish = false
 dpdk-sys = { path = "../dpdk-sys" }
 dpdk = { path = "../dpdk" }
 
+rand = { version = "0.8.5" }
 thiserror = { workspace = true }
 tracing = { workspace = true, features = ["attributes"] }
 tracing-subscriber = { workspace = true }
 
-rand = { version = "0.8" }
-
 [build-dependencies]
 dpdk-sysroot-helper = { path = "../dpdk-sysroot-helper" }

scratch/build.rs

@@ -5,6 +5,6 @@ fn main() {
     rerun_if_changed.iter().for_each(|file| {
         println!("cargo:rerun-if-changed={file}");
     });
-    println!("cargo:rustc-link-search=all={sysroot}/lib");
+    println!("cargo:rustc-link-search=native={sysroot}/lib");
     println!("cargo:rustc-link-arg=--sysroot={sysroot}");
 }

scripts/dpdk-sys.env

@@ -1,2 +1,2 @@
 DPDK_SYS_BRANCH="main"
-DPDK_SYS_COMMIT="02d235e5f259dd591401911b3336f72dea4c824a"
+DPDK_SYS_COMMIT="e4055e30aa6c44dcf97d7b4c992c6db5a1894241"