Remove Link::fd() method

With this change we remove the Link::fd() method in favor of the
recently added Link::as_fd(), which uses proper file descriptor wrapper
types that honor lifetimes.

Signed-off-by: Daniel Müller <[email protected]>

Author: d-e-s-o

libbpf-rs/CHANGELOG.md

@@ -12,8 +12,8 @@ Unreleased
   `Map`
 - Removed support for creating `Map` objects standalone (i.e. maps not created
   by libbpf)
-- Removed `Map::fd()` in favor of `Map::as_fd()`
-- Removed `Program::fd()` in favor of `Program::as_fd()`
+- Removed various `<object-type>::fd()` methods in favor of
+  `<object-type>::as_fd()`
 - Improved `btf_type_match!` macro, adding support for most of Rust's `match`
   capabilities
 - Added `skel` module exposing skeleton related traits

libbpf-rs/src/iter.rs

@@ -1,7 +1,10 @@
+use std::io;
+use std::os::unix::io::AsFd as _;
+use std::os::unix::io::AsRawFd as _;
+
 use nix::errno;
 use nix::libc;
 use nix::unistd;
-use std::io;
 
 use crate::libbpf_sys;
 use crate::Error;
@@ -22,7 +25,7 @@ pub struct Iter {
 impl Iter {
     /// Create a new `Iter` wrapping the provided `Link`.
     pub fn new(link: &Link) -> Result<Self> {
-        let link_fd = link.fd();
+        let link_fd = link.as_fd().as_raw_fd();
         let fd = unsafe { libbpf_sys::bpf_iter_create(link_fd) };
         if fd < 0 {
             return Err(Error::System(errno::errno()));

libbpf-rs/src/link.rs

@@ -83,11 +83,6 @@ impl Link {
         util::parse_ret(ret)
     }
 
-    /// Returns the file descriptor of the link.
-    pub fn fd(&self) -> i32 {
-        unsafe { libbpf_sys::bpf_link__fd(self.ptr.as_ptr()) }
-    }
-
     /// Returns path to BPF FS file or `None` if not pinned.
     pub fn pin_path(&self) -> Option<PathBuf> {
         let path_ptr = unsafe { libbpf_sys::bpf_link__pin_path(self.ptr.as_ptr()) };