Merge pull request #633 from ajwerner/change-fd-import

aya: replace os::unix::prelude with os::fd

aya/src/maps/array/program_array.rs

@@ -2,7 +2,7 @@
 
 use std::{
     borrow::{Borrow, BorrowMut},
-    os::unix::prelude::{AsRawFd, RawFd},
+    os::fd::{AsRawFd, RawFd},
 };
 
 use crate::{

aya/src/maps/mod.rs

@@ -42,7 +42,7 @@ use std::{
     marker::PhantomData,
     mem,
     ops::Deref,
-    os::unix::{io::RawFd, prelude::AsRawFd},
+    os::fd::{AsRawFd, RawFd},
     path::Path,
     ptr,
 };

aya/src/maps/perf/async_perf_event_array.rs

@@ -1,7 +1,7 @@
 use bytes::BytesMut;
 use std::{
     borrow::{Borrow, BorrowMut},
-    os::unix::prelude::{AsRawFd, RawFd},
+    os::fd::{AsRawFd, RawFd},
 };
 
 #[cfg(all(not(feature = "async_tokio"), feature = "async_std"))]

aya/src/maps/sock/sock_map.rs

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

aya/src/programs/cgroup_device.rs

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

aya/src/programs/cgroup_skb.rs

@@ -1,7 +1,7 @@
 //! Cgroup skb programs.
 use std::{
     hash::Hash,
-    os::unix::prelude::{AsRawFd, RawFd},
+    os::fd::{AsRawFd, RawFd},
     path::Path,
 };
 

aya/src/programs/cgroup_sock.rs

@@ -3,7 +3,7 @@ pub use aya_obj::programs::CgroupSockAttachType;
 
 use std::{
     hash::Hash,
-    os::unix::prelude::{AsRawFd, RawFd},
+    os::fd::{AsRawFd, RawFd},
     path::Path,
 };
 

aya/src/programs/cgroup_sock_addr.rs

@@ -3,7 +3,7 @@ pub use aya_obj::programs::CgroupSockAddrAttachType;
 
 use std::{
     hash::Hash,
-    os::unix::prelude::{AsRawFd, RawFd},
+    os::fd::{AsRawFd, RawFd},
     path::Path,
 };
 

aya/src/programs/cgroup_sockopt.rs

@@ -3,7 +3,7 @@ pub use aya_obj::programs::CgroupSockoptAttachType;
 
 use std::{
     hash::Hash,
-    os::unix::prelude::{AsRawFd, RawFd},
+    os::fd::{AsRawFd, RawFd},
     path::Path,
 };
 

aya/src/programs/cgroup_sysctl.rs

@@ -1,7 +1,7 @@
 //! Cgroup sysctl programs.
 use std::{
     hash::Hash,
-    os::unix::prelude::{AsRawFd, RawFd},
+    os::fd::{AsRawFd, RawFd},
 };
 
 use crate::{

aya/src/programs/extension.rs

@@ -1,5 +1,5 @@
 //! Extension programs.
-use std::os::unix::prelude::{AsRawFd, RawFd};
+use std::os::fd::{AsRawFd, RawFd};
 use thiserror::Error;
 
 use object::Endianness;

aya/src/programs/links.rs

@@ -6,7 +6,7 @@ use std::{
     collections::{hash_map::Entry, HashMap},
     ffi::CString,
     io,
-    os::unix::prelude::RawFd,
+    os::fd::RawFd,
     path::{Path, PathBuf},
 };
 

aya/src/programs/lirc_mode2.rs

@@ -1,5 +1,5 @@
 //! Lirc programs.
-use std::os::unix::prelude::{AsRawFd, RawFd};
+use std::os::fd::{AsRawFd, RawFd};
 
 use crate::{
     generated::{bpf_attach_type::BPF_LIRC_MODE2, bpf_prog_type::BPF_PROG_TYPE_LIRC_MODE2},

aya/src/programs/sk_lookup.rs

@@ -1,4 +1,4 @@
-use std::os::unix::prelude::{AsRawFd, RawFd};
+use std::os::fd::{AsRawFd, RawFd};
 
 use crate::{
     generated::{bpf_attach_type::BPF_SK_LOOKUP, bpf_prog_type::BPF_PROG_TYPE_SK_LOOKUP},

aya/src/programs/socket_filter.rs

@@ -2,7 +2,7 @@
 use libc::{setsockopt, SOL_SOCKET};
 use std::{
     io, mem,
-    os::unix::prelude::{AsRawFd, RawFd},
+    os::fd::{AsRawFd, RawFd},
 };
 use thiserror::Error;