From e0bc54cb7d9fe693b8513fce9e5fb21435c207cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Medina?= Date: Sat, 8 Jul 2023 17:05:08 -0700 Subject: [PATCH] fixing imports --- aya/src/maps/perf/perf_buffer.rs | 5 +---- aya/src/maps/perf/perf_event_array.rs | 2 +- aya/src/maps/sock/mod.rs | 5 +---- aya/src/maps/sock/sock_hash.rs | 2 +- aya/src/programs/cgroup_device.rs | 2 +- aya/src/programs/mod.rs | 5 +---- aya/src/programs/perf_attach.rs | 5 +---- aya/src/programs/sk_msg.rs | 2 +- aya/src/programs/sk_skb.rs | 2 +- aya/src/programs/sock_ops.rs | 2 +- aya/src/programs/xdp.rs | 5 +---- aya/src/sys/bpf.rs | 5 +---- aya/src/sys/netlink.rs | 2 +- test/integration-ebpf/src/bpf_probe_read.rs | 4 ++-- 14 files changed, 15 insertions(+), 33 deletions(-) diff --git a/aya/src/maps/perf/perf_buffer.rs b/aya/src/maps/perf/perf_buffer.rs index ec81c4ea..76dd07de 100644 --- a/aya/src/maps/perf/perf_buffer.rs +++ b/aya/src/maps/perf/perf_buffer.rs @@ -1,10 +1,7 @@ use std::{ ffi::c_void, io, mem, - os::{ - fd::{AsFd, BorrowedFd, OwnedFd}, - unix::io::{AsRawFd, RawFd}, - }, + os::fd::{AsFd, AsRawFd, BorrowedFd, OwnedFd, RawFd}, ptr, slice, sync::atomic::{self, AtomicPtr, Ordering}, }; diff --git a/aya/src/maps/perf/perf_event_array.rs b/aya/src/maps/perf/perf_event_array.rs index 7a24bf28..3d6a8103 100644 --- a/aya/src/maps/perf/perf_event_array.rs +++ b/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, }; diff --git a/aya/src/maps/sock/mod.rs b/aya/src/maps/sock/mod.rs index 4dcb0926..404f9d51 100644 --- a/aya/src/maps/sock/mod.rs +++ b/aya/src/maps/sock/mod.rs @@ -6,10 +6,7 @@ pub use sock_hash::SockHash; pub use sock_map::SockMap; use std::{ - os::{ - fd::{AsFd, BorrowedFd, OwnedFd}, - unix::io::{AsRawFd, RawFd}, - }, + os::fd::{AsFd, AsRawFd, BorrowedFd, OwnedFd, RawFd}, sync::Arc, }; diff --git a/aya/src/maps/sock/sock_hash.rs b/aya/src/maps/sock/sock_hash.rs index 80adf3b9..e7d08104 100644 --- a/aya/src/maps/sock/sock_hash.rs +++ b/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::{ diff --git a/aya/src/programs/cgroup_device.rs b/aya/src/programs/cgroup_device.rs index f028ae95..46f3e2bb 100644 --- a/aya/src/programs/cgroup_device.rs +++ b/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}, diff --git a/aya/src/programs/mod.rs b/aya/src/programs/mod.rs index 16e91759..67591d20 100644 --- a/aya/src/programs/mod.rs +++ b/aya/src/programs/mod.rs @@ -68,10 +68,7 @@ use libc::ENOSPC; use std::{ ffi::CString, io, - os::{ - fd::{AsFd, BorrowedFd, OwnedFd}, - unix::io::{AsRawFd, RawFd}, - }, + os::fd::{AsFd, AsRawFd, BorrowedFd, OwnedFd, RawFd}, path::{Path, PathBuf}, sync::Arc, }; diff --git a/aya/src/programs/perf_attach.rs b/aya/src/programs/perf_attach.rs index 0cabd257..5b97914e 100644 --- a/aya/src/programs/perf_attach.rs +++ b/aya/src/programs/perf_attach.rs @@ -1,8 +1,5 @@ //! Perf attach links. -use std::os::{ - fd::{AsFd, AsRawFd, BorrowedFd, OwnedFd}, - unix::io::RawFd, -}; +use std::os::fd::{AsFd, AsRawFd, BorrowedFd, OwnedFd, RawFd}; use crate::{ generated::bpf_attach_type::BPF_PERF_EVENT, diff --git a/aya/src/programs/sk_msg.rs b/aya/src/programs/sk_msg.rs index f6b9c75d..ad6a8531 100644 --- a/aya/src/programs/sk_msg.rs +++ b/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}, diff --git a/aya/src/programs/sk_skb.rs b/aya/src/programs/sk_skb.rs index 6cd3a3e3..fa915e1e 100644 --- a/aya/src/programs/sk_skb.rs +++ b/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, }; diff --git a/aya/src/programs/sock_ops.rs b/aya/src/programs/sock_ops.rs index eab2c876..89bf5646 100644 --- a/aya/src/programs/sock_ops.rs +++ b/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}, diff --git a/aya/src/programs/xdp.rs b/aya/src/programs/xdp.rs index 844f2208..003958b6 100644 --- a/aya/src/programs/xdp.rs +++ b/aya/src/programs/xdp.rs @@ -6,10 +6,7 @@ use std::{ ffi::CString, hash::Hash, io, - os::{ - fd::{AsFd, AsRawFd}, - unix::io::RawFd, - }, + os::fd::{AsFd, AsRawFd, RawFd}, }; use thiserror::Error; diff --git a/aya/src/sys/bpf.rs b/aya/src/sys/bpf.rs index bceb7b17..4dac4c83 100644 --- a/aya/src/sys/bpf.rs +++ b/aya/src/sys/bpf.rs @@ -3,10 +3,7 @@ use std::{ ffi::{CStr, CString}, io, mem::{self, MaybeUninit}, - os::{ - fd::{AsFd, AsRawFd, BorrowedFd, FromRawFd, OwnedFd}, - unix::io::RawFd, - }, + os::fd::{AsFd, AsRawFd, BorrowedFd, FromRawFd, OwnedFd, RawFd}, slice, }; diff --git a/aya/src/sys/netlink.rs b/aya/src/sys/netlink.rs index b0526cc3..868e4284 100644 --- a/aya/src/sys/netlink.rs +++ b/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::{ diff --git a/test/integration-ebpf/src/bpf_probe_read.rs b/test/integration-ebpf/src/bpf_probe_read.rs index 7e8e6c89..85920629 100644 --- a/test/integration-ebpf/src/bpf_probe_read.rs +++ b/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 };