aya: fix rustdoc warnings for StructOps link types

Replace define_link_wrapper! macro with manual link type definitions
for StructOps. The macro generates docs referencing StructOps::attach,
but struct_ops links come from StructOpsMap::attach() instead.

This also removes the StructOps::detach() and StructOps::take_link()
methods which were incorrect - struct_ops links are managed through
the map, not the program type.

Author: heeen

aya/src/programs/struct_ops.rs

@@ -7,7 +7,7 @@ use aya_obj::{
 use log::debug;
 
 use crate::programs::{
-    FdLink, FdLinkId, ProgramData, ProgramError, ProgramType, define_link_wrapper, load_program,
+    FdLink, FdLinkId, Link, ProgramData, ProgramError, ProgramType, links::id_as_key, load_program,
 };
 
 /// A program that implements a kernel struct_ops interface.
@@ -90,4 +90,64 @@ impl StructOps {
     }
 }
 
-define_link_wrapper!(StructOpsLink, StructOpsLinkId, FdLink, FdLinkId, StructOps);
+/// The identifier for a [`StructOpsLink`].
+///
+/// This is returned by [`StructOpsMap::attach`](crate::maps::StructOpsMap::attach).
+#[derive(Debug, Hash, Eq, PartialEq)]
+pub struct StructOpsLinkId(FdLinkId);
+
+/// The link used by [`StructOps`] programs.
+///
+/// This is created by [`StructOpsMap::attach`](crate::maps::StructOpsMap::attach)
+/// after the struct_ops map has been registered.
+#[derive(Debug)]
+pub struct StructOpsLink(Option<FdLink>);
+
+#[allow(dead_code)]
+impl StructOpsLink {
+    pub(crate) fn new(base: FdLink) -> StructOpsLink {
+        StructOpsLink(Some(base))
+    }
+
+    fn inner(&self) -> &FdLink {
+        self.0.as_ref().unwrap()
+    }
+
+    fn into_inner(mut self) -> FdLink {
+        self.0.take().unwrap()
+    }
+}
+
+impl Drop for StructOpsLink {
+    fn drop(&mut self) {
+        if let Some(base) = self.0.take() {
+            let _: Result<(), ProgramError> = base.detach();
+        }
+    }
+}
+
+impl Link for StructOpsLink {
+    type Id = StructOpsLinkId;
+
+    fn id(&self) -> Self::Id {
+        StructOpsLinkId(self.0.as_ref().unwrap().id())
+    }
+
+    fn detach(mut self) -> Result<(), ProgramError> {
+        self.0.take().unwrap().detach()
+    }
+}
+
+id_as_key!(StructOpsLink, StructOpsLinkId);
+
+impl From<FdLink> for StructOpsLink {
+    fn from(b: FdLink) -> StructOpsLink {
+        StructOpsLink(Some(b))
+    }
+}
+
+impl From<StructOpsLink> for FdLink {
+    fn from(mut w: StructOpsLink) -> FdLink {
+        w.0.take().unwrap()
+    }
+}

xtask/public-api/aya.txt

@@ -6824,9 +6824,6 @@ pub const aya::programs::struct_ops::StructOps::PROGRAM_TYPE: aya::programs::Pro
 pub fn aya::programs::struct_ops::StructOps::load(&mut self, struct_name: &str, btf: &aya_obj::btf::btf::Btf) -> core::result::Result<(), aya::programs::ProgramError>
 pub fn aya::programs::struct_ops::StructOps::member_name(&self) -> &str
 impl aya::programs::struct_ops::StructOps
-pub fn aya::programs::struct_ops::StructOps::detach(&mut self, link_id: aya::programs::struct_ops::StructOpsLinkId) -> core::result::Result<(), aya::programs::ProgramError>
-pub fn aya::programs::struct_ops::StructOps::take_link(&mut self, link_id: aya::programs::struct_ops::StructOpsLinkId) -> core::result::Result<aya::programs::struct_ops::StructOpsLink, aya::programs::ProgramError>
-impl aya::programs::struct_ops::StructOps
 pub fn aya::programs::struct_ops::StructOps::fd(&self) -> core::result::Result<&aya::programs::ProgramFd, aya::programs::ProgramError>
 impl aya::programs::struct_ops::StructOps
 pub fn aya::programs::struct_ops::StructOps::from_pin<P: core::convert::AsRef<std::path::Path>>(path: P) -> core::result::Result<Self, aya::programs::ProgramError>
@@ -10514,9 +10511,6 @@ pub const aya::programs::struct_ops::StructOps::PROGRAM_TYPE: aya::programs::Pro
 pub fn aya::programs::struct_ops::StructOps::load(&mut self, struct_name: &str, btf: &aya_obj::btf::btf::Btf) -> core::result::Result<(), aya::programs::ProgramError>
 pub fn aya::programs::struct_ops::StructOps::member_name(&self) -> &str
 impl aya::programs::struct_ops::StructOps
-pub fn aya::programs::struct_ops::StructOps::detach(&mut self, link_id: aya::programs::struct_ops::StructOpsLinkId) -> core::result::Result<(), aya::programs::ProgramError>
-pub fn aya::programs::struct_ops::StructOps::take_link(&mut self, link_id: aya::programs::struct_ops::StructOpsLinkId) -> core::result::Result<aya::programs::struct_ops::StructOpsLink, aya::programs::ProgramError>
-impl aya::programs::struct_ops::StructOps
 pub fn aya::programs::struct_ops::StructOps::fd(&self) -> core::result::Result<&aya::programs::ProgramFd, aya::programs::ProgramError>
 impl aya::programs::struct_ops::StructOps
 pub fn aya::programs::struct_ops::StructOps::from_pin<P: core::convert::AsRef<std::path::Path>>(path: P) -> core::result::Result<Self, aya::programs::ProgramError>