From 9e12c9324c623bf751053ff874bc47055343753e Mon Sep 17 00:00:00 2001
From: Alessandro Decina <alessandro.d@gmail.com>
Date: Wed, 14 Apr 2021 23:15:22 +0000
Subject: [PATCH] aya: fix warnings

---
 aya/src/maps/mod.rs                         | 6 +-----
 aya/src/maps/perf/async_perf_event_array.rs | 2 +-
 aya/src/programs/sk_msg.rs                  | 4 +---
 aya/src/programs/sk_skb.rs                  | 4 +---
 aya/src/sys/bpf.rs                          | 7 -------
 aya/src/util.rs                             | 2 +-
 6 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/aya/src/maps/mod.rs b/aya/src/maps/mod.rs
index 9d85f479..65b793d5 100644
--- a/aya/src/maps/mod.rs
+++ b/aya/src/maps/mod.rs
@@ -55,7 +55,7 @@ pub use array::{Array, PerCpuArray, ProgramArray};
 pub use hash_map::{HashMap, PerCpuHashMap};
 pub use map_lock::*;
 pub use perf::PerfEventArray;
-pub use sock::SockMap;
+pub use sock::{SockHash, SockMap};
 pub use stack_trace::StackTraceMap;
 
 #[derive(Error, Debug)]
@@ -300,10 +300,6 @@ pub(crate) struct PerCpuKernelMem {
 }
 
 impl PerCpuKernelMem {
-    pub(crate) fn as_ptr(&self) -> *const u8 {
-        self.bytes.as_ptr()
-    }
-
     pub(crate) fn as_mut_ptr(&mut self) -> *mut u8 {
         self.bytes.as_mut_ptr()
     }
diff --git a/aya/src/maps/perf/async_perf_event_array.rs b/aya/src/maps/perf/async_perf_event_array.rs
index cf5bff32..87382b0b 100644
--- a/aya/src/maps/perf/async_perf_event_array.rs
+++ b/aya/src/maps/perf/async_perf_event_array.rs
@@ -5,7 +5,7 @@ use std::{
     os::unix::prelude::{AsRawFd, RawFd},
 };
 
-#[cfg(feature = "async_std")]
+#[cfg(all(not(feature = "async_tokio"), feature = "async_std"))]
 use async_io::Async;
 
 #[cfg(feature = "async_tokio")]
diff --git a/aya/src/programs/sk_msg.rs b/aya/src/programs/sk_msg.rs
index 1332e8a8..f7951a18 100644
--- a/aya/src/programs/sk_msg.rs
+++ b/aya/src/programs/sk_msg.rs
@@ -1,8 +1,6 @@
-use std::ops::Deref;
-
 use crate::{
     generated::{bpf_attach_type::BPF_SK_MSG_VERDICT, bpf_prog_type::BPF_PROG_TYPE_SK_MSG},
-    maps::{sock::SocketMap, Map, SockMap},
+    maps::sock::SocketMap,
     programs::{load_program, LinkRef, ProgAttachLink, ProgramData, ProgramError},
     sys::bpf_prog_attach,
 };
diff --git a/aya/src/programs/sk_skb.rs b/aya/src/programs/sk_skb.rs
index de6abd3b..140c0bec 100644
--- a/aya/src/programs/sk_skb.rs
+++ b/aya/src/programs/sk_skb.rs
@@ -1,11 +1,9 @@
-use std::ops::Deref;
-
 use crate::{
     generated::{
         bpf_attach_type::{BPF_SK_SKB_STREAM_PARSER, BPF_SK_SKB_STREAM_VERDICT},
         bpf_prog_type::BPF_PROG_TYPE_SK_SKB,
     },
-    maps::{sock::SocketMap, Map, SockMap},
+    maps::sock::SocketMap,
     programs::{load_program, LinkRef, ProgAttachLink, ProgramData, ProgramError},
     sys::bpf_prog_attach,
 };
diff --git a/aya/src/sys/bpf.rs b/aya/src/sys/bpf.rs
index 2d0ff37a..6095d345 100644
--- a/aya/src/sys/bpf.rs
+++ b/aya/src/sys/bpf.rs
@@ -94,13 +94,6 @@ pub(crate) fn bpf_map_lookup_elem<K: Pod, V: Pod>(
     lookup(fd, key, flags, bpf_cmd::BPF_MAP_LOOKUP_ELEM)
 }
 
-pub(crate) fn bpf_map_lookup_and_delete_elem<K: Pod, V: Pod>(
-    fd: RawFd,
-    key: &K,
-) -> Result<Option<V>, (c_long, io::Error)> {
-    lookup(fd, key, 0, bpf_cmd::BPF_MAP_LOOKUP_AND_DELETE_ELEM)
-}
-
 pub(crate) fn bpf_map_lookup_elem_per_cpu<K: Pod, V: Pod>(
     fd: RawFd,
     key: &K,
diff --git a/aya/src/util.rs b/aya/src/util.rs
index ea28c73c..4cfe11c8 100644
--- a/aya/src/util.rs
+++ b/aya/src/util.rs
@@ -1,6 +1,6 @@
 //! Utility functions.
 use std::{
-    collections::{BTreeMap, HashMap},
+    collections::BTreeMap,
     fs::{self, File},
     io::{self, BufReader},
     str::FromStr,