diff --git a/aya-bpf-macros/src/cgroup_skb.rs b/aya-bpf-macros/src/cgroup_skb.rs index 94488382..606eb7b5 100644 --- a/aya-bpf-macros/src/cgroup_skb.rs +++ b/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 }) } diff --git a/aya-bpf-macros/src/kprobe.rs b/aya-bpf-macros/src/kprobe.rs index 7fab3077..06eb9e59 100644 --- a/aya-bpf-macros/src/kprobe.rs +++ b/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 { - let mut function = None; - let mut offset = None; - - if !attrs.is_empty() { - let mut args = syn::parse2(attrs)?; - function = pop_string_arg(&mut args, "function"); - offset = pop_string_arg(&mut args, "offset").map(|v| v.parse::().unwrap()); - err_on_unknown_args(&args)?; - } + let mut args = syn::parse2(attrs)?; + let function = pop_string_arg(&mut args, "function"); + let offset = pop_string_arg(&mut args, "offset").map(|v| v.parse::().unwrap()); + err_on_unknown_args(&args)?; + let item = syn::parse2(item)?; Ok(KProbe { kind, diff --git a/aya-bpf-macros/src/uprobe.rs b/aya-bpf-macros/src/uprobe.rs index 06140cb3..f9b8fac8 100644 --- a/aya-bpf-macros/src/uprobe.rs +++ b/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 { - let mut path = None; - let mut function = None; - let mut offset = None; - let mut sleepable = false; - if !attrs.is_empty() { - let mut args = syn::parse2(attrs)?; - 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::().unwrap()); - sleepable = pop_bool_arg(&mut args, "sleepable"); - err_on_unknown_args(&args)?; - } + let mut args = syn::parse2(attrs)?; + let path = pop_string_arg(&mut args, "path"); + let function = pop_string_arg(&mut args, "function"); + let offset = pop_string_arg(&mut args, "offset").map(|v| v.parse::().unwrap()); + let sleepable = pop_bool_arg(&mut args, "sleepable"); + err_on_unknown_args(&args)?; let item = syn::parse2(item)?; Ok(UProbe {