4
0
Эх сурвалжийг харах

build(deps): bump the cargo-crates group with 2 updates

Updates the requirements on [cargo_metadata](https://github.com/oli-obk/cargo_metadata) and [object](https://github.com/gimli-rs/object) to permit the latest version.

Updates `cargo_metadata` to 0.19.2
- [Release notes](https://github.com/oli-obk/cargo_metadata/releases)
- [Changelog](https://github.com/oli-obk/cargo_metadata/blob/main/CHANGELOG.md)
- [Commits](https://github.com/oli-obk/cargo_metadata/compare/0.19.0...0.19.2)

Updates `object` to 0.36.7
- [Changelog](https://github.com/gimli-rs/object/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gimli-rs/object/compare/0.36.0...0.36.7)

---
updated-dependencies:
- dependency-name: cargo_metadata
  dependency-version: 0.19.2
  dependency-type: direct:production
  dependency-group: cargo-crates
- dependency-name: object
  dependency-version: 0.36.7
  dependency-type: direct:production
  dependency-group: cargo-crates
...

Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] 1 долоо хоног өмнө
parent
commit
a7e3e6d4d9

+ 2 - 2
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 }

+ 1 - 1
aya-build/src/lib.rs

@@ -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.
-        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

+ 1 - 1
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 =

+ 1 - 0
xtask/public-api/aya-build.txt

@@ -27,4 +27,5 @@ 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
 impl<T> core::convert::From<T> for aya_build::Toolchain<'a>
 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<()>