Make RingBufferBuilder work with MapHandle

In our current vision, a MapHandle is the "more general" version of a
Map. We don't need the RingBufferBuilder to work only with Map objects
specifically. Rather, by accepting a MapHandle we open the door to using
both Map and MapHandle objects.

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

Author: d-e-s-o

libbpf-rs/src/ringbuf.rs

@@ -15,7 +15,7 @@ use std::time::Duration;
 use crate::libbpf_sys;
 use crate::util;
 use crate::Error;
-use crate::Map;
+use crate::MapHandle;
 use crate::MapType;
 use crate::Result;
 
@@ -45,9 +45,9 @@ impl Debug for RingBufferCallback<'_> {
 
 /// Builds [`RingBuffer`] instances.
 ///
-/// `ringbuf`s are a special kind of [`Map`], used to transfer data between
-/// [`Program`][crate::Program]s and userspace. As of Linux 5.8, the `ringbuf`
-/// map is now preferred over the `perf buffer`.
+/// `ringbuf`s are a special kind of [`Map`][crate::Map], used to transfer data
+/// between [`Program`][crate::Program]s and userspace. As of Linux 5.8, the
+/// `ringbuf` map is now preferred over the `perf buffer`.
 #[derive(Debug, Default)]
 pub struct RingBufferBuilder<'a> {
     fd_callbacks: Vec<(BorrowedFd<'a>, RingBufferCallback<'a>)>,
@@ -69,7 +69,7 @@ impl<'a> RingBufferBuilder<'a> {
     ///
     /// The callback provides a raw byte slice. You may find libraries such as
     /// [`plain`](https://crates.io/crates/plain) helpful.
-    pub fn add<NewF>(&mut self, map: &'a Map, callback: NewF) -> Result<&mut Self>
+    pub fn add<NewF>(&mut self, map: &'a MapHandle, callback: NewF) -> Result<&mut Self>
     where
         NewF: FnMut(&[u8]) -> i32 + 'a,
     {
@@ -141,9 +141,9 @@ impl<'a> RingBufferBuilder<'a> {
 
 /// The canonical interface for managing a collection of `ringbuf` maps.
 ///
-/// `ringbuf`s are a special kind of [`Map`], used to transfer data between
-/// [`Program`][crate::Program]s and userspace. As of Linux 5.8, the `ringbuf`
-/// map is now preferred over the `perf buffer`.
+/// `ringbuf`s are a special kind of [`Map`][crate::Map], used to transfer data
+/// between [`Program`][crate::Program]s and userspace. As of Linux 5.8, the
+/// `ringbuf` map is now preferred over the `perf buffer`.
 #[derive(Debug)]
 pub struct RingBuffer<'a> {
     ptr: NonNull<libbpf_sys::ring_buffer>,