From 3abe9bb859320063484c5d222f8322bf8392fec2 Mon Sep 17 00:00:00 2001
From: Alessandro Decina <alessandro.d@gmail.com>
Date: Sun, 14 Feb 2021 08:09:42 +0000
Subject: [PATCH] Fix RawFd import paths

---
 aya/src/maps/hash_map.rs             | 3 ++-
 aya/src/maps/mod.rs                  | 4 ++--
 aya/src/maps/perf_map/perf_buffer.rs | 4 ++--
 aya/src/maps/perf_map/perf_map.rs    | 9 +++++++--
 aya/src/programs/mod.rs              | 7 +++++--
 aya/src/programs/perf_attach.rs      | 4 ++--
 aya/src/programs/xdp.rs              | 3 +--
 aya/src/sys/bpf.rs                   | 3 ++-
 8 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/aya/src/maps/hash_map.rs b/aya/src/maps/hash_map.rs
index 45cd7f6e..d2288460 100644
--- a/aya/src/maps/hash_map.rs
+++ b/aya/src/maps/hash_map.rs
@@ -3,6 +3,7 @@ use std::{
     marker::PhantomData,
     mem,
     ops::{Deref, DerefMut},
+    os::unix::io::RawFd,
 };
 
 use crate::{
@@ -12,7 +13,7 @@ use crate::{
         bpf_map_delete_elem, bpf_map_lookup_and_delete_elem, bpf_map_lookup_elem,
         bpf_map_update_elem,
     },
-    Pod, RawFd,
+    Pod,
 };
 
 pub struct HashMap<T: Deref<Target = Map>, K, V> {
diff --git a/aya/src/maps/mod.rs b/aya/src/maps/mod.rs
index ef35abdc..d429621c 100644
--- a/aya/src/maps/mod.rs
+++ b/aya/src/maps/mod.rs
@@ -1,10 +1,10 @@
-use std::{ffi::CString, io};
+use std::{ffi::CString, io, os::unix::io::RawFd};
 use thiserror::Error;
 
 use crate::{
     obj,
     sys::{bpf_create_map, bpf_map_get_next_key},
-    Pod, RawFd,
+    Pod,
 };
 
 mod hash_map;
diff --git a/aya/src/maps/perf_map/perf_buffer.rs b/aya/src/maps/perf_map/perf_buffer.rs
index 0759610d..8caf2089 100644
--- a/aya/src/maps/perf_map/perf_buffer.rs
+++ b/aya/src/maps/perf_map/perf_buffer.rs
@@ -1,7 +1,7 @@
 use std::{
     ffi::c_void,
     io, mem,
-    os::unix::prelude::AsRawFd,
+    os::unix::io::{AsRawFd, RawFd},
     ptr, slice,
     sync::atomic::{self, AtomicPtr, Ordering},
 };
@@ -13,7 +13,7 @@ use thiserror::Error;
 use crate::{
     generated::{perf_event_header, perf_event_mmap_page, perf_event_type::*},
     sys::{perf_event_ioctl, perf_event_open},
-    RawFd, PERF_EVENT_IOC_DISABLE, PERF_EVENT_IOC_ENABLE,
+    PERF_EVENT_IOC_DISABLE, PERF_EVENT_IOC_ENABLE,
 };
 
 #[derive(Error, Debug)]
diff --git a/aya/src/maps/perf_map/perf_map.rs b/aya/src/maps/perf_map/perf_map.rs
index 3e6120e6..da6d99e1 100644
--- a/aya/src/maps/perf_map/perf_map.rs
+++ b/aya/src/maps/perf_map/perf_map.rs
@@ -1,4 +1,10 @@
-use std::{convert::TryFrom, io, ops::DerefMut, os::unix::prelude::AsRawFd, sync::Arc};
+use std::{
+    convert::TryFrom,
+    io,
+    ops::DerefMut,
+    os::unix::io::{AsRawFd, RawFd},
+    sync::Arc,
+};
 
 use bytes::BytesMut;
 use libc::{sysconf, _SC_PAGESIZE};
@@ -9,7 +15,6 @@ use crate::{
     maps::perf_map::{Events, PerfBuffer, PerfBufferError},
     maps::{Map, MapError, MapRefMut},
     sys::bpf_map_update_elem,
-    RawFd,
 };
 
 #[derive(Error, Debug)]
diff --git a/aya/src/programs/mod.rs b/aya/src/programs/mod.rs
index 60f81c12..94f0877b 100644
--- a/aya/src/programs/mod.rs
+++ b/aya/src/programs/mod.rs
@@ -5,7 +5,10 @@ pub mod trace_point;
 pub mod xdp;
 
 use libc::{close, ENOSPC};
-use std::{cell::RefCell, cmp, convert::TryFrom, ffi::CStr, io, os::raw::c_uint, rc::Rc};
+use std::{
+    cell::RefCell, cmp, convert::TryFrom, ffi::CStr, io, os::raw::c_uint, os::unix::io::RawFd,
+    rc::Rc,
+};
 use thiserror::Error;
 
 use perf_attach::*;
@@ -14,7 +17,7 @@ pub use socket_filter::{SocketFilter, SocketFilterError};
 pub use trace_point::{TracePoint, TracePointError};
 pub use xdp::{Xdp, XdpError};
 
-use crate::{obj, sys::bpf_load_program, RawFd};
+use crate::{obj, sys::bpf_load_program};
 #[derive(Debug, Error)]
 pub enum ProgramError {
     #[error("the program is already loaded")]
diff --git a/aya/src/programs/perf_attach.rs b/aya/src/programs/perf_attach.rs
index 5e170391..612cba85 100644
--- a/aya/src/programs/perf_attach.rs
+++ b/aya/src/programs/perf_attach.rs
@@ -1,8 +1,8 @@
 use libc::close;
+use std::os::unix::io::RawFd;
 
 use crate::{
-    sys::perf_event_ioctl, RawFd, PERF_EVENT_IOC_DISABLE, PERF_EVENT_IOC_ENABLE,
-    PERF_EVENT_IOC_SET_BPF,
+    sys::perf_event_ioctl, PERF_EVENT_IOC_DISABLE, PERF_EVENT_IOC_ENABLE, PERF_EVENT_IOC_SET_BPF,
 };
 
 use super::{Link, LinkRef, ProgramData, ProgramError};
diff --git a/aya/src/programs/xdp.rs b/aya/src/programs/xdp.rs
index d36ea65f..6f2f72fa 100644
--- a/aya/src/programs/xdp.rs
+++ b/aya/src/programs/xdp.rs
@@ -1,6 +1,6 @@
 use bitflags;
 use libc::if_nametoindex;
-use std::{ffi::CString, io};
+use std::{ffi::CString, io, os::unix::io::RawFd};
 use thiserror::Error;
 
 use crate::{
@@ -12,7 +12,6 @@ use crate::{
     sys::bpf_link_create,
     sys::kernel_version,
     sys::netlink_set_xdp_fd,
-    RawFd,
 };
 
 #[derive(Debug, Error)]
diff --git a/aya/src/sys/bpf.rs b/aya/src/sys/bpf.rs
index fc0a4fb3..63abd157 100644
--- a/aya/src/sys/bpf.rs
+++ b/aya/src/sys/bpf.rs
@@ -3,6 +3,7 @@ use std::{
     ffi::CStr,
     io,
     mem::{self, MaybeUninit},
+    os::unix::io::RawFd,
     slice,
 };
 
@@ -13,7 +14,7 @@ use crate::{
     generated::{bpf_attach_type, bpf_attr, bpf_cmd, bpf_insn},
     programs::VerifierLog,
     sys::SysResult,
-    Pod, RawFd, BPF_OBJ_NAME_LEN,
+    Pod, BPF_OBJ_NAME_LEN,
 };
 
 use super::{syscall, Syscall};