aya-bpf-macros: Remove useless attrs.is_empty

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>

aya-bpf-macros/src/cgroup_skb.rs

@@ -18,11 +18,10 @@ impl CgroupSkb {
             let ident: Ident = syn::parse2(attrs)?;
             match ident.to_string().as_str() {
                 "ingress" | "egress" => (),
-                _ => abort!(attach_type, "invalid attach type"),
+                _ => abort!(ident, "invalid attach type"),
             }
             attach_type = Some(ident.to_string());
         }
-
         Ok(CgroupSkb { item, attach_type })
     }
 

aya-bpf-macros/src/kprobe.rs

@@ -33,15 +33,11 @@ pub(crate) struct KProbe {
 
 impl KProbe {
     pub(crate) fn parse(kind: KProbeKind, attrs: TokenStream, item: TokenStream) -> Result<KProbe> {
-        let mut function = None;
+        let mut args = syn::parse2(attrs)?;
-        let mut offset = None;
+        let function = pop_string_arg(&mut args, "function");
-
+        let offset = pop_string_arg(&mut args, "offset").map(|v| v.parse::<u64>().unwrap());
-        if !attrs.is_empty() {
+        err_on_unknown_args(&args)?;
-            let mut args = syn::parse2(attrs)?;
+
-            function = pop_string_arg(&mut args, "function");
-            offset = pop_string_arg(&mut args, "offset").map(|v| v.parse::<u64>().unwrap());
-            err_on_unknown_args(&args)?;
-        }
         let item = syn::parse2(item)?;
         Ok(KProbe {
             kind,

aya-bpf-macros/src/uprobe.rs

@@ -35,18 +35,12 @@ pub(crate) struct UProbe {
 
 impl UProbe {
     pub(crate) fn parse(kind: UProbeKind, attrs: TokenStream, item: TokenStream) -> Result<UProbe> {
-        let mut path = None;
+        let mut args = syn::parse2(attrs)?;
-        let mut function = None;
+        let path = pop_string_arg(&mut args, "path");
-        let mut offset = None;
+        let function = pop_string_arg(&mut args, "function");
-        let mut sleepable = false;
+        let offset = pop_string_arg(&mut args, "offset").map(|v| v.parse::<u64>().unwrap());
-        if !attrs.is_empty() {
+        let sleepable = pop_bool_arg(&mut args, "sleepable");
-            let mut args = syn::parse2(attrs)?;
+        err_on_unknown_args(&args)?;
-            path = pop_string_arg(&mut args, "path");
-            function = pop_string_arg(&mut args, "function");
-            offset = pop_string_arg(&mut args, "offset").map(|v| v.parse::<u64>().unwrap());
-            sleepable = pop_bool_arg(&mut args, "sleepable");
-            err_on_unknown_args(&args)?;
-        }
 
         let item = syn::parse2(item)?;
         Ok(UProbe {