diff --git a/Cargo.toml b/Cargo.toml index 3edb5d25..ef41ae44 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -68,7 +68,7 @@ base64 = { version = "0.22.1", default-features = false } bindgen = { version = "0.71", default-features = false } bitflags = { version = "2.2.1", default-features = false } bytes = { version = "1", default-features = false } -cargo_metadata = { version = "0.19.0", default-features = false } +cargo_metadata = { version = "0.20.0", default-features = false } clap = { version = "4", default-features = false } const-assert = { version = "1.0.1", 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 } nix = { version = "0.30.1", default-features = false } num_enum = { version = "0.7", default-features = false } -object = { version = "0.36", default-features = false } +object = { version = "0.37", default-features = false } once_cell = { version = "1.20.1", default-features = false } proc-macro2 = { version = "1", default-features = false } proc-macro2-diagnostics = { version = "0.10.1", default-features = false } diff --git a/aya-build/src/lib.rs b/aya-build/src/lib.rs index 761ad34a..666ab02b 100644 --- a/aya-build/src/lib.rs +++ b/aya-build/src/lib.rs @@ -95,7 +95,7 @@ pub fn build_ebpf(packages: impl IntoIterator, toolchain: Toolch } // Workaround for https://github.com/rust-lang/cargo/issues/6412 where cargo flocks itself. - let target_dir = out_dir.join(name); + let target_dir = out_dir.join(name.as_str()); cmd.arg("--target-dir").arg(&target_dir); let mut child = cmd diff --git a/test/integration-test/build.rs b/test/integration-test/build.rs index 612df7e2..9834bdea 100644 --- a/test/integration-test/build.rs +++ b/test/integration-test/build.rs @@ -52,7 +52,7 @@ fn main() -> Result<()> { .context("MetadataCommand::exec")?; let integration_ebpf_package = packages .into_iter() - .find(|Package { name, .. }| name == "integration-ebpf") + .find(|Package { name, .. }| name.as_str() == "integration-ebpf") .ok_or_else(|| anyhow!("integration-ebpf package not found"))?; let manifest_dir = diff --git a/xtask/public-api/aya-build.txt b/xtask/public-api/aya-build.txt index f5db5050..ac71b9b3 100644 --- a/xtask/public-api/aya-build.txt +++ b/xtask/public-api/aya-build.txt @@ -27,4 +27,5 @@ impl core::borrow::BorrowMut for aya_build::Toolchain<'a> where T: ?core:: pub fn aya_build::Toolchain<'a>::borrow_mut(&mut self) -> &mut T impl core::convert::From for aya_build::Toolchain<'a> pub fn aya_build::Toolchain<'a>::from(t: T) -> T +impl yoke::erased::ErasedDestructor for aya_build::Toolchain<'a> where T: 'static pub fn aya_build::build_ebpf(packages: impl core::iter::traits::collect::IntoIterator, toolchain: aya_build::Toolchain<'_>) -> anyhow::Result<()>