From acbf98e890458c4bd4fbd0d03638ade074a0fcba Mon Sep 17 00:00:00 2001
From: Davide Bertola <dade@dadeb.it>
Date: Thu, 2 Jun 2022 22:51:20 +0200
Subject: [PATCH] minor lint
---
aya/src/programs/mod.rs | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/aya/src/programs/mod.rs b/aya/src/programs/mod.rs
index d589bfc6..5cbd1565 100644
--- a/aya/src/programs/mod.rs
+++ b/aya/src/programs/mod.rs
@@ -388,12 +388,9 @@ impl<T: Link> ProgramData<T> {
fn unload_program<T: Link>(data: &mut ProgramData<T>) -> Result<(), ProgramError> {
data.links.remove_all()?;
- if let Some(fd) = data.fd.take() {
- unsafe {
- libc::close(fd);
- }
- } else {
- return Err(ProgramError::NotLoaded);
+ let fd = data.fd.take().ok_or(ProgramError::NotLoaded)?;
+ unsafe {
+ libc::close(fd);
}
Ok(())
}