From a3ab2eff57c55faf323d9663e9198851abdc3e2f Mon Sep 17 00:00:00 2001
From: Alessandro Decina <alessandro.d@gmail.com>
Date: Sun, 14 Feb 2021 08:36:27 +0000
Subject: [PATCH] Format fixes

---
 aya/src/maps/perf_map/perf_map.rs | 6 ++++--
 aya/src/obj/btf/btf.rs            | 3 +--
 aya/src/programs/mod.rs           | 7 ++++++-
 aya/src/programs/xdp.rs           | 4 +---
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/aya/src/maps/perf_map/perf_map.rs b/aya/src/maps/perf_map/perf_map.rs
index da6d99e1..ba51aab4 100644
--- a/aya/src/maps/perf_map/perf_map.rs
+++ b/aya/src/maps/perf_map/perf_map.rs
@@ -12,8 +12,10 @@ use thiserror::Error;
 
 use crate::{
     generated::bpf_map_type::BPF_MAP_TYPE_PERF_EVENT_ARRAY,
-    maps::perf_map::{Events, PerfBuffer, PerfBufferError},
-    maps::{Map, MapError, MapRefMut},
+    maps::{
+        perf_map::{Events, PerfBuffer, PerfBufferError},
+        Map, MapError, MapRefMut,
+    },
     sys::bpf_map_update_elem,
 };
 
diff --git a/aya/src/obj/btf/btf.rs b/aya/src/obj/btf/btf.rs
index 96323911..059aca45 100644
--- a/aya/src/obj/btf/btf.rs
+++ b/aya/src/obj/btf/btf.rs
@@ -12,8 +12,7 @@ use thiserror::Error;
 
 use crate::{
     generated::{btf_ext_header, btf_header},
-    obj::btf::relocation::Relocation,
-    obj::btf::BtfType,
+    obj::btf::{relocation::Relocation, BtfType},
 };
 
 pub(crate) const MAX_RESOLVE_DEPTH: u8 = 32;
diff --git a/aya/src/programs/mod.rs b/aya/src/programs/mod.rs
index 94f0877b..fe2fdf57 100644
--- a/aya/src/programs/mod.rs
+++ b/aya/src/programs/mod.rs
@@ -6,7 +6,12 @@ pub mod xdp;
 
 use libc::{close, ENOSPC};
 use std::{
-    cell::RefCell, cmp, convert::TryFrom, ffi::CStr, io, os::raw::c_uint, os::unix::io::RawFd,
+    cell::RefCell,
+    cmp,
+    convert::TryFrom,
+    ffi::CStr,
+    io,
+    os::{raw::c_uint, unix::io::RawFd},
     rc::Rc,
 };
 use thiserror::Error;
diff --git a/aya/src/programs/xdp.rs b/aya/src/programs/xdp.rs
index 6f2f72fa..3e4563fb 100644
--- a/aya/src/programs/xdp.rs
+++ b/aya/src/programs/xdp.rs
@@ -9,9 +9,7 @@ use crate::{
         XDP_FLAGS_HW_MODE, XDP_FLAGS_REPLACE, XDP_FLAGS_SKB_MODE, XDP_FLAGS_UPDATE_IF_NOEXIST,
     },
     programs::{load_program, FdLink, Link, LinkRef, ProgramData, ProgramError},
-    sys::bpf_link_create,
-    sys::kernel_version,
-    sys::netlink_set_xdp_fd,
+    sys::{bpf_link_create, kernel_version, netlink_set_xdp_fd},
 };
 
 #[derive(Debug, Error)]