From c3b902137becc48b72091ba59a9a4e297ba56d33 Mon Sep 17 00:00:00 2001
From: Alessandro Decina <alessandro.d@gmail.com>
Date: Sun, 14 Mar 2021 01:42:53 +0000
Subject: [PATCH] aya: add aya::maps::array and move ProgramArray under it

---
 aya/src/maps/array/mod.rs                 | 4 ++++
 aya/src/maps/{ => array}/program_array.rs | 0
 aya/src/maps/hash_map/hash_map.rs         | 1 -
 aya/src/maps/hash_map/mod.rs              | 1 +
 aya/src/maps/mod.rs                       | 4 ++--
 5 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 aya/src/maps/array/mod.rs
 rename aya/src/maps/{ => array}/program_array.rs (100%)

diff --git a/aya/src/maps/array/mod.rs b/aya/src/maps/array/mod.rs
new file mode 100644
index 00000000..d297742e
--- /dev/null
+++ b/aya/src/maps/array/mod.rs
@@ -0,0 +1,4 @@
+//! Array types.
+mod program_array;
+
+pub use program_array::ProgramArray;
diff --git a/aya/src/maps/program_array.rs b/aya/src/maps/array/program_array.rs
similarity index 100%
rename from aya/src/maps/program_array.rs
rename to aya/src/maps/array/program_array.rs
diff --git a/aya/src/maps/hash_map/hash_map.rs b/aya/src/maps/hash_map/hash_map.rs
index a937d9fb..cd65636a 100644
--- a/aya/src/maps/hash_map/hash_map.rs
+++ b/aya/src/maps/hash_map/hash_map.rs
@@ -1,4 +1,3 @@
-//! Hash map types.
 use std::{
     convert::TryFrom,
     marker::PhantomData,
diff --git a/aya/src/maps/hash_map/mod.rs b/aya/src/maps/hash_map/mod.rs
index dc895845..531fbfdd 100644
--- a/aya/src/maps/hash_map/mod.rs
+++ b/aya/src/maps/hash_map/mod.rs
@@ -1,3 +1,4 @@
+//! Hash map types.
 use std::mem;
 
 use crate::{
diff --git a/aya/src/maps/mod.rs b/aya/src/maps/mod.rs
index b085efdb..ea013e93 100644
--- a/aya/src/maps/mod.rs
+++ b/aya/src/maps/mod.rs
@@ -40,15 +40,15 @@ use crate::{
     Pod,
 };
 
+pub mod array;
 pub mod hash_map;
 mod map_lock;
 pub mod perf;
-pub mod program_array;
 
+pub use array::ProgramArray;
 pub use hash_map::{HashMap, PerCpuHashMap};
 pub use map_lock::*;
 pub use perf::PerfEventArray;
-pub use program_array::ProgramArray;
 
 #[derive(Error, Debug)]
 pub enum MapError {