From 4b6d97e4db4261921a43958366b66fa3e0da237b Mon Sep 17 00:00:00 2001
From: Milan <milan@mdaverde.com>
Date: Wed, 14 Dec 2022 15:46:54 -0500
Subject: [PATCH] Fix CI, clippy and feedback

Signed-off-by: Milan <milan@mdaverde.com>
---
 aya-bpf-macros/src/lib.rs         | 14 +++-----------
 aya/src/programs/cgroup_device.rs |  3 ++-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/aya-bpf-macros/src/lib.rs b/aya-bpf-macros/src/lib.rs
index 7cd40dc5..6c3c0699 100644
--- a/aya-bpf-macros/src/lib.rs
+++ b/aya-bpf-macros/src/lib.rs
@@ -7,7 +7,7 @@ use expand::{
     SockoptArgs, TracePoint, Xdp,
 };
 use proc_macro::TokenStream;
-use syn::{parse_macro_input, token::Token, ItemFn, ItemStatic};
+use syn::{parse_macro_input, ItemFn, ItemStatic};
 
 #[proc_macro_attribute]
 pub fn map(attrs: TokenStream, item: TokenStream) -> TokenStream {
@@ -523,19 +523,11 @@ pub fn sk_lookup(attrs: TokenStream, item: TokenStream) -> TokenStream {
 ///     macros::cgroup_device,
 ///     programs::DeviceContext,
 /// };
-/// use aya_log_ebpf::info;
 ///
 /// #[cgroup_device(name="cgroup_dev")]
 /// pub fn cgroup_dev(ctx: DeviceContext) -> i32 {
-///     match try_cgroup_dev(ctx) {
-///         Ok(ret) => ret,
-///         Err(ret) => ret,
-///     }
-/// }
-///
-/// fn try_cgroup_dev(ctx: DeviceContext) -> Result<i32, i32> {
-///     info!(&ctx, "device operation called");
-///     Ok(0)
+///     // Reject all device access
+///     return 0;
 /// }
 /// ```
 #[proc_macro_attribute]
diff --git a/aya/src/programs/cgroup_device.rs b/aya/src/programs/cgroup_device.rs
index 194c2df1..3bff0ec5 100644
--- a/aya/src/programs/cgroup_device.rs
+++ b/aya/src/programs/cgroup_device.rs
@@ -9,7 +9,7 @@ use crate::{
     sys::{bpf_link_create, bpf_prog_attach, kernel_version},
 };
 
-/// A program used to watch or prevent device interaction from a cgroup
+/// A program used to watch or prevent device interaction from a cgroup.
 ///
 /// [`CgroupDevice`] programs can be attached to a cgroup and will be called every
 /// time a process inside that cgroup tries to access (e.g. read, write, mknod)
@@ -41,6 +41,7 @@ impl CgroupDevice {
     pub fn load(&mut self) -> Result<(), ProgramError> {
         load_program(BPF_PROG_TYPE_CGROUP_DEVICE, &mut self.data)
     }
+
     /// Attaches the program to the given cgroup.
     ///
     /// The returned value can be used to detach, see [CgroupDevice::detach]