From 275c5b6bbc3cf3dfac79d5dacb46377e2d296fe7 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Thu, 2 Oct 2025 23:37:03 -0400 Subject: [PATCH] ebpf: use `ptr::from_ref` This is consistent with other such conversions. --- ebpf/aya-ebpf/src/lib.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ebpf/aya-ebpf/src/lib.rs b/ebpf/aya-ebpf/src/lib.rs index 91d9fa27..da969290 100644 --- a/ebpf/aya-ebpf/src/lib.rs +++ b/ebpf/aya-ebpf/src/lib.rs @@ -33,7 +33,7 @@ pub mod helpers; pub mod maps; pub mod programs; -use core::ptr::NonNull; +use core::ptr::{self, NonNull}; pub use aya_ebpf_cty as cty; pub use aya_ebpf_macros as macros; @@ -144,8 +144,8 @@ pub fn check_bounds_signed(value: i64, lower: i64, upper: i64) -> bool { #[inline] fn insert(def: *mut c_void, key: &K, value: &V, flags: u64) -> Result<(), c_long> { - let key: *const _ = key; - let value: *const _ = value; + let key = ptr::from_ref(key); + let value = ptr::from_ref(value); match unsafe { bpf_map_update_elem(def.cast(), key.cast(), value.cast(), flags) } { 0 => Ok(()), ret => Err(ret), @@ -154,7 +154,7 @@ fn insert(def: *mut c_void, key: &K, value: &V, flags: u64) -> Result<(), #[inline] fn remove(def: *mut c_void, key: &K) -> Result<(), c_long> { - let key: *const _ = key; + let key = ptr::from_ref(key); match unsafe { bpf_map_delete_elem(def.cast(), key.cast()) } { 0 => Ok(()), ret => Err(ret), @@ -163,6 +163,6 @@ fn remove(def: *mut c_void, key: &K) -> Result<(), c_long> { #[inline] fn lookup(def: *mut c_void, key: &K) -> Option> { - let key: *const _ = key; + let key = ptr::from_ref(key); NonNull::new(unsafe { bpf_map_lookup_elem(def.cast(), key.cast()) }.cast()) }