fixing imports

aya/src/maps/perf/perf_buffer.rs

@@ -1,10 +1,7 @@
 use std::{
     ffi::c_void,
     io, mem,
-    os::{
+    os::fd::{AsFd, AsRawFd, BorrowedFd, OwnedFd, RawFd},
-        fd::{AsFd, BorrowedFd, OwnedFd},
-        unix::io::{AsRawFd, RawFd},
-    },
     ptr, slice,
     sync::atomic::{self, AtomicPtr, Ordering},
 };

aya/src/maps/perf/perf_event_array.rs

@@ -4,7 +4,7 @@
 use std::{
     borrow::{Borrow, BorrowMut},
     ops::Deref,
-    os::unix::io::{AsRawFd, RawFd},
+    os::fd::{AsRawFd, RawFd},
     sync::Arc,
 };
 

aya/src/maps/sock/mod.rs

@@ -6,10 +6,7 @@ pub use sock_hash::SockHash;
 pub use sock_map::SockMap;
 
 use std::{
-    os::{
+    os::fd::{AsFd, AsRawFd, BorrowedFd, OwnedFd, RawFd},
-        fd::{AsFd, BorrowedFd, OwnedFd},
-        unix::io::{AsRawFd, RawFd},
-    },
     sync::Arc,
 };
 

aya/src/maps/sock/sock_hash.rs

@@ -1,7 +1,7 @@
 use std::{
     borrow::{Borrow, BorrowMut},
     marker::PhantomData,
-    os::unix::io::{AsRawFd, RawFd},
+    os::fd::{AsRawFd, RawFd},
 };
 
 use crate::{

aya/src/programs/cgroup_device.rs

@@ -1,5 +1,5 @@
 //! Cgroup device programs.
-use std::os::{fd::AsFd, unix::prelude::AsRawFd};
+use std::os::fd::{AsFd, AsRawFd};
 
 use crate::{
     generated::{bpf_attach_type::BPF_CGROUP_DEVICE, bpf_prog_type::BPF_PROG_TYPE_CGROUP_DEVICE},

aya/src/programs/mod.rs

@@ -68,10 +68,7 @@ use libc::ENOSPC;
 use std::{
     ffi::CString,
     io,
-    os::{
+    os::fd::{AsFd, AsRawFd, BorrowedFd, OwnedFd, RawFd},
-        fd::{AsFd, BorrowedFd, OwnedFd},
-        unix::io::{AsRawFd, RawFd},
-    },
     path::{Path, PathBuf},
     sync::Arc,
 };

aya/src/programs/perf_attach.rs

@@ -1,8 +1,5 @@
 //! Perf attach links.
-use std::os::{
+use std::os::fd::{AsFd, AsRawFd, BorrowedFd, OwnedFd, RawFd};
-    fd::{AsFd, AsRawFd, BorrowedFd, OwnedFd},
-    unix::io::RawFd,
-};
 
 use crate::{
     generated::bpf_attach_type::BPF_PERF_EVENT,

aya/src/programs/sk_msg.rs

@@ -1,6 +1,6 @@
 //! Skmsg programs.
 
-use std::os::{fd::AsFd, unix::io::AsRawFd};
+use std::os::fd::{AsFd, AsRawFd};
 
 use crate::{
     generated::{bpf_attach_type::BPF_SK_MSG_VERDICT, bpf_prog_type::BPF_PROG_TYPE_SK_MSG},

aya/src/programs/sk_skb.rs

@@ -1,7 +1,7 @@
 //! Skskb programs.
 
 use std::{
-    os::{fd::AsFd, unix::io::AsRawFd},
+    os::fd::{AsFd, AsRawFd},
     path::Path,
 };
 

aya/src/programs/sock_ops.rs

@@ -1,5 +1,5 @@
 //! Socket option programs.
-use std::os::{fd::AsFd, unix::io::AsRawFd};
+use std::os::fd::{AsFd, AsRawFd};
 
 use crate::{
     generated::{bpf_attach_type::BPF_CGROUP_SOCK_OPS, bpf_prog_type::BPF_PROG_TYPE_SOCK_OPS},

aya/src/programs/xdp.rs

@@ -6,10 +6,7 @@ use std::{
     ffi::CString,
     hash::Hash,
     io,
-    os::{
+    os::fd::{AsFd, AsRawFd, RawFd},
-        fd::{AsFd, AsRawFd},
-        unix::io::RawFd,
-    },
 };
 use thiserror::Error;
 

aya/src/sys/bpf.rs

@@ -3,10 +3,7 @@ use std::{
     ffi::{CStr, CString},
     io,
     mem::{self, MaybeUninit},
-    os::{
+    os::fd::{AsFd, AsRawFd, BorrowedFd, FromRawFd, OwnedFd, RawFd},
-        fd::{AsFd, AsRawFd, BorrowedFd, FromRawFd, OwnedFd},
-        unix::io::RawFd,
-    },
     slice,
 };
 

aya/src/sys/netlink.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, ffi::CStr, io, mem, os::unix::io::RawFd, ptr, slice};
+use std::{collections::HashMap, ffi::CStr, io, mem, os::fd::RawFd, ptr, slice};
 use thiserror::Error;
 
 use libc::{

test/integration-ebpf/src/bpf_probe_read.rs

@@ -14,8 +14,8 @@ macro_rules! read_str_bytes {
     ($fun:ident, $ptr:expr, $len:expr $(,)?) => {
         let r = unsafe {
             let Some(ptr) = RESULT.get_ptr_mut(0) else {
-                                                return;
+                                                        return;
-                                            };
+                                                    };
             &mut *ptr
         };