Compare commits

..

No commits in common. 'd1ed76e626acb85bdb33ffe0470435fd963f64d6' and 'e239f3abbda176ded01699dde6c22c40cdc0fd5e' have entirely different histories.

@ -68,7 +68,7 @@ base64 = { version = "0.22.1", default-features = false }
bindgen = { version = "0.71", default-features = false } bindgen = { version = "0.71", default-features = false }
bitflags = { version = "2.2.1", default-features = false } bitflags = { version = "2.2.1", default-features = false }
bytes = { version = "1", default-features = false } bytes = { version = "1", default-features = false }
cargo_metadata = { version = "0.20.0", default-features = false } cargo_metadata = { version = "0.19.0", default-features = false }
clap = { version = "4", default-features = false } clap = { version = "4", default-features = false }
const-assert = { version = "1.0.1", default-features = false } const-assert = { version = "1.0.1", default-features = false }
dialoguer = { version = "0.11", default-features = false } dialoguer = { version = "0.11", default-features = false }
@ -85,7 +85,7 @@ netns-rs = { version = "0.1", default-features = false }
network-types = { version = "0.0.8", default-features = false } network-types = { version = "0.0.8", default-features = false }
nix = { version = "0.30.1", default-features = false } nix = { version = "0.30.1", default-features = false }
num_enum = { version = "0.7", default-features = false } num_enum = { version = "0.7", default-features = false }
object = { version = "0.37", default-features = false } object = { version = "0.36", default-features = false }
once_cell = { version = "1.20.1", default-features = false } once_cell = { version = "1.20.1", default-features = false }
proc-macro2 = { version = "1", default-features = false } proc-macro2 = { version = "1", default-features = false }
proc-macro2-diagnostics = { version = "0.10.1", default-features = false } proc-macro2-diagnostics = { version = "0.10.1", default-features = false }

@ -95,7 +95,7 @@ pub fn build_ebpf(packages: impl IntoIterator<Item = Package>, toolchain: Toolch
} }
// Workaround for https://github.com/rust-lang/cargo/issues/6412 where cargo flocks itself. // Workaround for https://github.com/rust-lang/cargo/issues/6412 where cargo flocks itself.
let target_dir = out_dir.join(name.as_str()); let target_dir = out_dir.join(name);
cmd.arg("--target-dir").arg(&target_dir); cmd.arg("--target-dir").arg(&target_dir);
let mut child = cmd let mut child = cmd

@ -52,7 +52,7 @@ fn main() -> Result<()> {
.context("MetadataCommand::exec")?; .context("MetadataCommand::exec")?;
let integration_ebpf_package = packages let integration_ebpf_package = packages
.into_iter() .into_iter()
.find(|Package { name, .. }| name.as_str() == "integration-ebpf") .find(|Package { name, .. }| name == "integration-ebpf")
.ok_or_else(|| anyhow!("integration-ebpf package not found"))?; .ok_or_else(|| anyhow!("integration-ebpf package not found"))?;
let manifest_dir = let manifest_dir =

@ -27,5 +27,4 @@ impl<T> core::borrow::BorrowMut<T> for aya_build::Toolchain<'a> where T: ?core::
pub fn aya_build::Toolchain<'a>::borrow_mut(&mut self) -> &mut T pub fn aya_build::Toolchain<'a>::borrow_mut(&mut self) -> &mut T
impl<T> core::convert::From<T> for aya_build::Toolchain<'a> impl<T> core::convert::From<T> for aya_build::Toolchain<'a>
pub fn aya_build::Toolchain<'a>::from(t: T) -> T pub fn aya_build::Toolchain<'a>::from(t: T) -> T
impl<T> yoke::erased::ErasedDestructor for aya_build::Toolchain<'a> where T: 'static
pub fn aya_build::build_ebpf(packages: impl core::iter::traits::collect::IntoIterator<Item = cargo_metadata::Package>, toolchain: aya_build::Toolchain<'_>) -> anyhow::Result<()> pub fn aya_build::build_ebpf(packages: impl core::iter::traits::collect::IntoIterator<Item = cargo_metadata::Package>, toolchain: aya_build::Toolchain<'_>) -> anyhow::Result<()>

Loading…
Cancel
Save