Bladeren bron

aya-tool: remove outdated workaround

The comment says that `.derive_debug` was needed as
a workaround for https://github.com/rust-lang/rust-bindgen/issues/2083.
This issue is now closed, and aya-tool compiles without derive_debug.

Additionally, update bindgen dependency to 1.64.

Signed-off-by: Dmitry Savintsev <[email protected]>
Dmitry Savintsev 2 jaren geleden
bovenliggende
commit
96b282d149
2 gewijzigde bestanden met toevoegingen van 1 en 8 verwijderingen
  1. 1 1
      aya-tool/Cargo.toml
  2. 0 7
      aya-tool/src/bindgen.rs

+ 1 - 1
aya-tool/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Alessandro Decina <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-bindgen = "0.63"
+bindgen = "0.64"
 clap = { version = "4", features = ["derive"] }
 anyhow = "1"
 thiserror = "1"

+ 0 - 7
aya-tool/src/bindgen.rs

@@ -20,11 +20,4 @@ pub fn bpf_builder() -> Builder {
         .clang_arg("-Wno-unknown-attributes")
         .default_enum_style(EnumVariation::ModuleConsts)
         .prepend_enum_name(false)
-        // NOTE(vadorovsky): It's a workaround for the upstream bindgen issue:
-        // https://github.com/rust-lang/rust-bindgen/issues/2083
-        // tl;dr: Rust nightly complains about #[repr(packed)] structs deriving
-        // Debug without Copy.
-        // It needs to be fixed properly upstream, but for now we have to
-        // disable Debug derive here.
-        .derive_debug(false)
 }