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

aya: replace os::unix::prelude with os::fd
pull/531/head
Tamir Duberstein 1 year ago committed by GitHub
commit 5c6bd55260
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

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

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

@ -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"))]

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

@ -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},

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

@ -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,
};

@ -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,
};

@ -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,
};

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

@ -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;

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

@ -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},

@ -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},

@ -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;

Loading…
Cancel
Save