From 5dfd27dbd052139df139fb2fa80f4dccb3af0ce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alessandro=C2=A0Decina?= <alessandro.d@gmail.com>
Date: Sun, 4 Jul 2021 01:05:17 +0000
Subject: [PATCH] bpf: fix some clippy warnings

---
 bpf/aya-bpf-bindings/build.rs      | 4 ++--
 bpf/aya-bpf-cty/build.rs           | 4 ++--
 bpf/aya-bpf-macros/src/expand.rs   | 4 ++--
 bpf/aya-bpf/src/programs/sk_skb.rs | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bpf/aya-bpf-bindings/build.rs b/bpf/aya-bpf-bindings/build.rs
index f6ed9c89..c3117f3f 100644
--- a/bpf/aya-bpf-bindings/build.rs
+++ b/bpf/aya-bpf-bindings/build.rs
@@ -1,9 +1,9 @@
 use std::env;
 
 fn main() {
-    if !env::var("CARGO_CFG_BPF_TARGET_ARCH").is_ok() {
+    if env::var("CARGO_CFG_BPF_TARGET_ARCH").is_err() {
         let arch = env::var("HOST").unwrap();
-        let arch = arch.splitn(2, "-").next().unwrap();
+        let arch = arch.splitn(2, '-').next().unwrap();
         println!("cargo:rustc-cfg=bpf_target_arch=\"{}\"", arch);
     }
 }
diff --git a/bpf/aya-bpf-cty/build.rs b/bpf/aya-bpf-cty/build.rs
index f6ed9c89..c3117f3f 100644
--- a/bpf/aya-bpf-cty/build.rs
+++ b/bpf/aya-bpf-cty/build.rs
@@ -1,9 +1,9 @@
 use std::env;
 
 fn main() {
-    if !env::var("CARGO_CFG_BPF_TARGET_ARCH").is_ok() {
+    if env::var("CARGO_CFG_BPF_TARGET_ARCH").is_err() {
         let arch = env::var("HOST").unwrap();
-        let arch = arch.splitn(2, "-").next().unwrap();
+        let arch = arch.splitn(2, '-').next().unwrap();
         println!("cargo:rustc-cfg=bpf_target_arch=\"{}\"", arch);
     }
 }
diff --git a/bpf/aya-bpf-macros/src/expand.rs b/bpf/aya-bpf-macros/src/expand.rs
index 4b3ccb7c..b079026e 100644
--- a/bpf/aya-bpf-macros/src/expand.rs
+++ b/bpf/aya-bpf-macros/src/expand.rs
@@ -226,8 +226,8 @@ impl CgroupSkb {
 
         Ok(CgroupSkb {
             item,
-            name,
             expected_attach_type,
+            name,
         })
     }
 
@@ -260,7 +260,7 @@ fn pop_arg(args: &mut Args, name: &str) -> Option<String> {
 }
 
 fn err_on_unknown_args(args: &Args) -> Result<()> {
-    for arg in &args.args {
+    if let Some(arg) = args.args.get(0) {
         return Err(Error::new_spanned(&arg.name, "invalid argument"));
     }
 
diff --git a/bpf/aya-bpf/src/programs/sk_skb.rs b/bpf/aya-bpf/src/programs/sk_skb.rs
index 4ddcd4f2..23e28a27 100644
--- a/bpf/aya-bpf/src/programs/sk_skb.rs
+++ b/bpf/aya-bpf/src/programs/sk_skb.rs
@@ -36,7 +36,7 @@ impl SkSkbContext {
     }
 
     #[inline]
-    pub fn cb_mut(&self) -> &mut [u32] {
+    pub fn cb_mut(&mut self) -> &mut [u32] {
         unsafe { &mut (*self.skb).cb }
     }